beaker-pe 1.28.0 → 1.29.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OWVhNGRjNGI1NGZkYThmYTQ3NDliMTNkZGQ2Zjg5OTFhNjEwZmQxMA==
+    YjJjMDhkODRmN2EzN2ZjMmQyMjViMzYyNjBmNTkxNjM2N2FiZTc3Zg==
   data.tar.gz: !binary |-
-    Yzc5MWQ5NTFlY2U2YTc2YTNlMTIyOWVjMjVlMzQ3OTNhYjAwNWU5NQ==
+    MDYzNjdhN2QzZTkzZWVjMWY4YTkzM2NjZDY1NmVkZWZkZTRkZDBhNw==
 SHA512:
   metadata.gz: !binary |-
-    YmNmNTM2MjViYzU2MTllYzNkYzg1ODFmOTc1OWVkMGRhMDc0OGUzYzg2MzU1
-    NDlkOTg5NGUzZGYwOTcyMjVkODI5ZDZkNzQ2YWI3ZjdlOWUwZjA2ZDQ5MTc5
-    ZWVhZWE5NTNjNDFlOWMwMTNlNzkwNzdhMGZjODBkNjZmZTk3Y2Y=
+    MmE5YWJlMmNiZjg5YTMzNTY5MGIwYjUzZWE5MDhmNDE2M2Q3YTFiMGE3MzQ2
+    ZGQwNWMwMGRiZDA3NWNhMzcwNWJjNGM0NTg1Y2JkM2Y2YTViYzUxMDA1ZDky
+    NGNlYjU0MTZlZTgyY2UzYjBiNmRkMDRmMzcwNGFiY2ZiY2FlNWU=
   data.tar.gz: !binary |-
-    NjdhMjg1N2U3ZDFkYjg5MDVmZGQ4ZjNiZjM4YjBmZGNmZjRhNDI5MDU3ZDgw
-    ZWI1ODE3ZDU1ZGEzODllYjE5ZjcyYjg5NDU5ZmI5MTY5NjJhNTQxYmQyMjU3
-    YjA1NTFlNmI2ZWQ5M2E4MDI0OTQ1ZWExZjRkZDMzMDM3NGI5OWU=
+    ZmEyMTcxZmM0NDVmZDc4YTIwZTRhN2RlM2ViZjNhMWNhMWVmMjJiNjVlZmU3
+    ZDllNDk4M2UyZmFiZDY0OTdmMzRjM2FhYTdjNGI2YjNlYmZlMTk1YWJkNjlm
+    ZjMwOGMyODgyNTkwMWVkOTA3YjNlMTdiNWRjNTk4MGEyZjcyMmQ=

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

@@ -1318,13 +1318,15 @@ module Beaker
 
         #Installs PE with a PE managed external postgres
         def do_install_pe_with_pe_managed_external_postgres(hosts, opts)
+          pe_infrastructure = select_hosts({:roles => ['master', 'compile_master', 'dashboard', 'database', 'pe_postgres']}, hosts)
+          non_infrastructure = hosts.reject{|host| pe_infrastructure.include? host}
 
           is_upgrade = (original_pe_ver(hosts[0]) != hosts[0][:pe_ver])
           step "Setup tmp installer directory and pe.conf" do
 
-            prepare_hosts(hosts,opts)
+            prepare_hosts(pe_infrastructure,opts)
             register_feature_flags!(opts)
-            fetch_pe(hosts,opts)
+            fetch_pe(pe_infrastructure,opts)
 
             [master, database, dashboard, pe_postgres].uniq.each do |host|
               prepare_host_installer_options(host)
@@ -1363,6 +1365,19 @@ module Beaker
               on host, 'puppet agent -t', :acceptable_exit_codes => [0,2]
             end
           end
+
+          if(non_infrastructure.size > 0)
+            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]
+              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
         end
 
         # Grabs the pe file from a remote host to the machine running Beaker, then

data/lib/beaker-pe/version.rb

@@ -3,7 +3,7 @@ module Beaker
     module PE
 
       module Version
-        STRING = '1.28.0'
+        STRING = '1.29.0'
       end
 
     end

data/spec/beaker-pe/install/pe_utils_spec.rb

@@ -1131,12 +1131,13 @@ describe ClassMixedWithDSLInstallUtils do
     end
   end
 
-  describe 'do_install_pe_with_pe_managed_external_postgres' do
+  describe 'do_install_pe_with_pe_managed_external_postgres with an agent' do
     let(:mono_master) { make_host('mono_master', :pe_ver => '2017.2', :platform => 'ubuntu-16.04-x86_64', :roles => ['master', 'database', 'dashboard']) }
     let(:pe_postgres) { make_host('pe_postgres', :pe_ver => '2017.2', :platform => 'el-7-x86_64', :roles => ['pe_postgres', 'agent']) }
     let(:split_master) { make_host('mono_master', :pe_ver => '2017.2', :platform => 'ubuntu-16.04-x86_64', :roles => ['master', 'agent']) }
     let(:split_database) { make_host('split_database', :pe_ver => '2017.2', :platform => 'ubuntu-16.04-x86_64', :roles => ['database', 'agent']) }
     let(:split_console) { make_host('mono_master', :pe_ver => '2017.2', :platform => 'ubuntu-16.04-x86_64', :roles => ['dashboard', 'agent']) }
+    let(:agent) { make_host('agent', :pe_ver => '2017.2', :platform => 'el-7-x86_64', :roles => ['agent'])}
 
     it 'will do a monolithic installation of PE with an external postgres that is managed by PE' do
       allow(subject).to receive(:fetch_pe).with([mono_master, pe_postgres], {}).and_return(true)
@@ -1153,10 +1154,13 @@ describe ClassMixedWithDSLInstallUtils do
       allow(subject).to receive(:execute_installer_cmd).with(mono_master, {}).twice
       allow(subject).to receive(:execute_installer_cmd).with(pe_postgres, {}).once
 
-      allow(subject).to receive(:on).with(mono_master, "puppet agent -t", :acceptable_exit_codes=>[0, 2]).once
+      allow(subject).to receive(:on).with(mono_master, "puppet agent -t", :acceptable_exit_codes=>[0, 2]).exactly(3).times
       allow(subject).to receive(:on).with(pe_postgres, "puppet agent -t", :acceptable_exit_codes=> [0, 2]).once
 
-      expect{ subject.do_install_pe_with_pe_managed_external_postgres([mono_master, pe_postgres], {}) }.not_to raise_error
+      allow(subject).to receive(:install_agents_only_on).with([agent], {})
+      allow(subject).to receive(:run_puppet_on_non_infrastructure_nodes).with([agent])
+
+      expect{ subject.do_install_pe_with_pe_managed_external_postgres([mono_master, pe_postgres, agent], {}) }.not_to raise_error
     end
 
     it 'will do a monolithic upgrade of PE with an external postgres that is managed by PE' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-pe
 version: !ruby/object:Gem::Version
-  version: 1.28.0
+  version: 1.29.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-20 00:00:00.000000000 Z
+date: 2017-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec