pe_utils.rb in beaker-pe-1.19.0

- old
+ new

@@ -108,11 +108,11 @@
               end
             end
 
             pe_debug = host[:pe_debug] || opts[:pe_debug] ? ' -x' : ''
             if host['platform'] =~ /windows/ then
-              "powershell -c \"cd #{host['working_dir']};[Net.ServicePointManager]::ServerCertificateValidationCallback = {\\$true};\\$webClient = New-Object System.Net.WebClient;\\$webClient.DownloadFile('https://#{master}:8140/packages/#{version}/install.ps1', '#{host['working_dir']}/install.ps1');#{host['working_dir']}/install.ps1 -verbose #{frictionless_install_opts.join(' ')}\""
+              "powershell -c \"cd #{host['working_dir']};[Net.ServicePointManager]::ServerCertificateValidationCallback = {\\$true};\\$webClient = New-Object System.Net.WebClient;\\$webClient.DownloadFile('https://#{master}:8140/packages/current/install.ps1', '#{host['working_dir']}/install.ps1');#{host['working_dir']}/install.ps1 -verbose #{frictionless_install_opts.join(' ')}\""
             elsif host['platform'] =~ /aix/ then
               curl_opts = '--tlsv1 -O'
               "cd #{host['working_dir']} && curl #{curl_opts} https://#{master}:8140/packages/current/install.bash && bash#{pe_debug} install.bash #{frictionless_install_opts.join(' ')}".strip
             else
               curl_opts = '--tlsv1 -kO'
@@ -491,9 +491,13 @@
             #Workaround for windows frictionless install, see BKR-943 for the reason
             agents.select {|agent| agent['platform'] =~ /windows/}.each do |agent|
               client_datadir = agent.puppet['client_datadir']
               on(agent, puppet("resource file \"#{client_datadir}\" ensure=absent force=true"))
             end
+          end
+
+          step "Run puppet a second time on the primary to populate services.conf (PE-19054)" do
+            on(master, puppet_agent('-t'), :acceptable_exit_codes => [0,2])
           end
         end
 
         def generic_install hosts, opts = {}
           step "Installing PE on a generic set of hosts"