From 4e38a457c535526605713061d171f299f4d5d053 Mon Sep 17 00:00:00 2001 From: Rob Szkutak Date: Fri, 4 Aug 2017 11:12:20 -0500 Subject: [PATCH] Fix issue causing password to be prompted for multiple times in bootstrap and wipe when it does not exist --- deploy/lib/server_config.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/deploy/lib/server_config.rb b/deploy/lib/server_config.rb index d1d442b1..21962b0b 100644 --- a/deploy/lib/server_config.rb +++ b/deploy/lib/server_config.rb @@ -120,6 +120,8 @@ def initialize(options) logger.warn "WARN: unable to determine MarkLogic Host name of #{@hostname}" end + @properties["ml.password"] = @ml_password + begin r = execute_query %Q{ substring-before(xdmp:version(), ".") } r.body = parse_body r.body @@ -681,7 +683,7 @@ def restart rescue logger.debug 'Retry attempt ' + retry_count.to_s + ' failed' end - + if new_timestamp != old_timestamp # Indicates that restart is confirmed successful break