beaker-pe 3.6.1 → 3.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dfd1d8c42972081bb9b5f9f49d4f1cefd90424a84594dfdf1c96a136fa48d7d8
-  data.tar.gz: eff2646196013b1cf2ad368e4a5f4ce3fe4c6d5534dcf5425f5024dc1b508b53
+  metadata.gz: 82fe681f6a5d8f304089ca2dca03e4e9080cbf502b0665e072103dac9e9e4aa9
+  data.tar.gz: 22f5065db00df1654fdc261de80272b0a3719db9fc6e2027b0f92d3e300f90e8
 SHA512:
-  metadata.gz: '069a53cb8696fb530fe31c90cb3820408285a56894bfa62c6677dd4ea89a9e183a74dc1f1771bebb14bd1ec43af32457427d6b712eb5a0587a14e9a251df0efe'
-  data.tar.gz: f3053f4e7d7a3a1aae929b40448e8c60357e814cd8bedc91a3d165d899932410575f11d02c3ca3f6a3ed65d7b95db32292278abcbb7a035ceca0012ac3a16958
+  metadata.gz: bc742e9c75813510b30970550c55ec34c56727e1209e2c8a71ea69c89ff1fe1a67e4abd1e4f98ae39ed5d01140f4ad04b6afd795ed264f9c3fd840c749c9ab9a
+  data.tar.gz: 20d4a84d869295af9703cc72e0c2f3f277e8735f0380337f13ea1be23c51a081c6171ae73c5c4edfee98899327490325ed4f5252513b331ff819b968e05c4066

data/lib/beaker-pe/install/pe_utils.rb

@@ -825,8 +825,10 @@ NOASK
 
           install_agents_only_on(agents, opts)
 
+          # waitforlock in case install_agents_only_on triggers a puppet run on the
+          # master that is still in progress when we get here
           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])
+            on(master, puppet_agent("-t #{waitforlock_flag(master)}".rstrip), :acceptable_exit_codes => [0,2])
           end
         end
 
@@ -2102,9 +2104,11 @@ EOM
             stop_agent_on(pe_infrastructure, :run_in_parallel => true)
           end
 
+          # waitforlock in case stopping the agent run after stopping the agent service
+          # takes a little longer than usual
           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]
+              on host, ["puppet agent -t", waitforlock_flag(host)].reject(&:empty?).join(' '), :acceptable_exit_codes => [0,2]
             end
           end
 
@@ -2112,13 +2116,15 @@ EOM
             install_agents_only_on(non_infrastructure, opts)
 
             step "Run puppet to setup mcollective and pxp-agent" do
-              on master, 'puppet agent -t', :acceptable_exit_codes => [0,2]
+              on master, ["puppet agent -t", waitforlock_flag(master)].reject(&:empty?).join(' '), :acceptable_exit_codes => [0,2]
               run_puppet_on_non_infrastructure_nodes(non_infrastructure)
             end
 
           end
+          # waitforlock in case install_agents_only_on triggers a puppet run on the
+          # master that is still in progress when we get here
           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]
+            on master, ["puppet agent -t", waitforlock_flag(master)].reject(&:empty?).join(' '), :acceptable_exit_codes => [0,2]
           end
         end
 

data/lib/beaker-pe/version.rb

@@ -3,7 +3,7 @@ module Beaker
     module PE
 
       module Version
-        STRING = '3.6.1'
+        STRING = '3.6.2'
       end
 
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beaker-pe
 version: !ruby/object:Gem::Version
-  version: 3.6.1
+  version: 3.6.2
 platform: ruby
 authors:
 - Puppetlabs
@@ -320,7 +320,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.10
 specification_version: 4
 summary: Beaker PE DSL Helpers!
 test_files: []