lib/beaker-pe/install/pe_utils.rb in beaker-pe-2.0.4 vs lib/beaker-pe/install/pe_utils.rb in beaker-pe-2.0.5

@@ -1537,11 +1537,11 @@
               [master, database, dashboard].uniq.each do |host|
                 execute_installer_cmd(host, opts)
               end
           end
 
-          step "Final puppet run on infrastructure + postgres node" do
+          step "First puppet run on infrastructure + postgres node" do
             [master, database, dashboard, pe_postgres].uniq.each do |host|
               on host, 'puppet agent -t', :acceptable_exit_codes => [0,2]
             end
           end
 
@@ -1551,12 +1551,12 @@
             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(non_infrastructure)
             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
+          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
 
         #Check the lastest install log to confirm the expected failure is there
         def is_expected_pe_postgres_failure?(host)