pe_utils.rb in beaker-pe-1.17.0

- old
+ new

@@ -468,12 +468,12 @@
               end
             end
           end
 
           step "Install agents" do
-            agents.group_by {|agent| installer_cmd(agent, opts)}.each do |cmd, agents|
-              on agents, cmd, :run_in_parallel => true
+            block_on(agents, {:run_in_parallel => true}) do |host|
+              on(host, installer_cmd(host, opts))
             end
           end
 
           step "Sign agent certificates" do
             # This will sign all cert requests
@@ -483,9 +483,10 @@
           step "Stop puppet agents to avoid interfering with tests" do
             stop_agent_on(all_hosts, :run_in_parallel => true)
           end
 
           step "Run puppet to setup mcollective and pxp-agent" do
+            on(master, puppet_agent('-t'), :acceptable_exit_codes => [0,2])
             run_puppet_on_non_infrastructure_nodes(all_hosts)
 
             #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']