beaker-pe 1.27.0 → 1.28.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZGIxMzQ2NjExMDg5MGJlODU2YWYxNmFiYTZjYmE0MDcxNTVkZGRjYw==
+    OWVhNGRjNGI1NGZkYThmYTQ3NDliMTNkZGQ2Zjg5OTFhNjEwZmQxMA==
   data.tar.gz: !binary |-
-    OGQzMmQ1N2FiNjNjNjMwYjIwYTdkZDIzMzgwYjkwMDNjOGU5ZmJlOQ==
+    Yzc5MWQ5NTFlY2U2YTc2YTNlMTIyOWVjMjVlMzQ3OTNhYjAwNWU5NQ==
 SHA512:
   metadata.gz: !binary |-
-    ZDc4N2Y3OTk3MTc3ZDMyMThiMTdjOGU5ZmY3MGYxYTdlMGYwM2EyNWE4NzRh
-    NzMyNTY5NzM4OTBjODgyMjc2ZjExMTFhZDQyZDc3ZDU3ZGJkZTc3ZWM5MTBh
-    ZWY1NTQ3M2NiNzAxYWFhMTFmZjk1NjQ1ZGVjOGNhMzAxYWFlZmQ=
+    YmNmNTM2MjViYzU2MTllYzNkYzg1ODFmOTc1OWVkMGRhMDc0OGUzYzg2MzU1
+    NDlkOTg5NGUzZGYwOTcyMjVkODI5ZDZkNzQ2YWI3ZjdlOWUwZjA2ZDQ5MTc5
+    ZWVhZWE5NTNjNDFlOWMwMTNlNzkwNzdhMGZjODBkNjZmZTk3Y2Y=
   data.tar.gz: !binary |-
-    Y2MwOWVhNjFiNzBhNzEwN2U5OGZlYzgwOWY1MGE0NTUxM2YyYWRlYmNjZGY5
-    YjE2MjM1NDdiOWU3NDgyNTk3YTZiYzZlZjlhN2RkMTIwZDdlYjVlOTU5MjA2
-    YjdiOTRjOGI2OTBiNDMyOTljNGIzNThlZjJmY2QyYTRiYzUwZWQ=
+    NjdhMjg1N2U3ZDFkYjg5MDVmZGQ4ZjNiZjM4YjBmZGNmZjRhNDI5MDU3ZDgw
+    ZWI1ODE3ZDU1ZGEzODllYjE5ZjcyYjg5NDU5ZmI5MTY5NjJhNTQxYmQyMjU3
+    YjA1NTFlNmI2ZWQ5M2E4MDI0OTQ1ZWExZjRkZDMzMDM3NGI5OWU=

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

@@ -224,6 +224,11 @@ module Beaker
           end
         end
 
+        #This calls the installer command on the host in question
+        def execute_installer_cmd(host, opts)
+          on host, installer_cmd(host, opts)
+        end
+
         #Determine the PE package to download/upload on a mac host, download/upload that package onto the host.
         # Assumed file name format: puppet-enterprise-3.3.0-rc1-559-g97f0833-osx-10.9-x86_64.dmg.
         # @param [Host] host The mac host to download/upload and unpack PE onto
@@ -476,6 +481,8 @@ module Beaker
           # detect the kind of install we're doing
           install_type = determine_install_type(hosts, opts)
           case install_type
+          when :pe_managed_postgres
+            do_install_pe_with_pe_managed_external_postgres(hosts,opts)
           when :simple_monolithic
             simple_monolithic_install(hosts.first, hosts.drop(1), opts)
           when :simple_split
@@ -499,13 +506,16 @@ module Beaker
         #   determine_install_type(hosts, {:type => :install, :pe_ver => '2017.2.0'})
         #
         # @return [Symbol]
-        #   One of :generic, :simple_monolithic, :simple_split
+        #   One of :generic, :simple_monolithic, :simple_split, :pe_managed_postgres
         #   :simple_monolithic
         #     returned when installing >=2016.4 with a monolithic master and
         #     any number of frictionless agents
         #   :simple_split
         #     returned when installing >=2016.4 with a split install and any
         #     number of frictionless agents
+        #   :pe_managed_postgres
+        #     returned when installing PE with postgres being managed on a node
+        #     that is different then the database node
         #   :generic
         #     returned for any other install or upgrade
         #
@@ -524,6 +534,8 @@ module Beaker
             :simple_monolithic
           elsif hosts[0]['roles'].include?('master') && hosts[1]['roles'].include?('database') && hosts[2]['roles'].include?('dashboard') && hosts.drop(3).all? {|host| host['roles'].include?('frictionless')}
             :simple_split
+          elsif hosts.any? {|host| host['roles'].include?('pe_postgres')}
+            :pe_managed_postgres
           else
             :generic
           end
@@ -1304,6 +1316,55 @@ module Beaker
           do_higgs_install higgs_host, options
         end
 
+        #Installs PE with a PE managed external postgres
+        def do_install_pe_with_pe_managed_external_postgres(hosts, opts)
+
+          is_upgrade = (original_pe_ver(hosts[0]) != hosts[0][:pe_ver])
+          step "Setup tmp installer directory and pe.conf" do
+
+            prepare_hosts(hosts,opts)
+            register_feature_flags!(opts)
+            fetch_pe(hosts,opts)
+
+            [master, database, dashboard, pe_postgres].uniq.each do |host|
+              prepare_host_installer_options(host)
+
+              unless is_upgrade
+                setup_pe_conf(host, hosts, opts)
+              end
+            end
+          end
+
+          unless is_upgrade
+            step "Initial master install, expected to fail due to RBAC database not being initialized" do
+              begin
+                execute_installer_cmd(master, opts)
+              rescue Beaker::Host::CommandFailure => e
+                #The way the master fails to install includes this specific line as of PE 2018.1.x.
+                unless e.message =~ /The operation could not be completed because RBACs database has not been initialized/
+                  raise "Install on master failed in an unexpected manner"
+                end
+              end
+            end
+          end
+
+          step "Install/Upgrade postgres service on pe-postgres node" do
+            execute_installer_cmd(pe_postgres, opts)
+          end
+
+          step "Finish install/upgrade on infrastructure" do
+              [master, database, dashboard].uniq.each do |host|
+                execute_installer_cmd(host, opts)
+              end
+          end
+
+          step "Final 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
+        end
+
         # Grabs the pe file from a remote host to the machine running Beaker, then
         # scp's the file out to the host.
         #
@@ -1479,6 +1540,23 @@ module Beaker
           end
         end
 
+        # Return the original pe_ver setting for the passed host.
+        # Beaker resets pe_ver to the value of pe_upgrade_ver during its upgrade process.
+        # If the hosts's original configuration did not have a pe_ver, return the
+        # value of pe_ver set directly in options.  It's the Host['pe_ver'] that
+        # gets overwritten by Beaker on upgrade.  So if the original host config did not
+        # have a pe_ver set, there should be a pe_ver set in options and we can use
+        # that.
+        def original_pe_ver(host)
+          options[:HOSTS][host.name][:pe_ver] || options[:pe_ver]
+        end
+
+        # Returns the version of PE that the host will be upgraded to
+        # If no upgrade is planned then just the version of PE to install is returned
+        def upgrading_to_pe_ver(host)
+          options[:HOSTS][host.name][:pe_upgrade_ver] || options[:pe_ver]
+        end
+
         # @return a Ruby object of any root key in pe.conf.
         #
         # @param key [String] to lookup

data/lib/beaker-pe/version.rb

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

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

@@ -1070,6 +1070,7 @@ describe ClassMixedWithDSLInstallUtils do
     let(:puppetdb) { make_host('puppetdb', :pe_ver => '2016.4', :roles => [ 'database' ]) }
     let(:console) { make_host('console', :pe_ver => '2016.4', :roles => [ 'dashboard' ]) }
     let(:agent) { make_host('agent', :pe_ver => '2016.4', :roles => ['frictionless']) }
+    let(:pe_postgres) { make_host('pe_postgres', :pe_ver => '2016.4', :roles => [ 'pe_postgres' ]) }
 
     it 'identifies a monolithic install with frictionless agents' do
       hosts = [monolithic, agent, agent, agent]
@@ -1112,11 +1113,159 @@ describe ClassMixedWithDSLInstallUtils do
       hosts = [monolithic, master, agent, agent, agent]
       expect(subject.determine_install_type(hosts, {})).to eq(:generic)
     end
+
     it 'identifies an install that requires windows msi install as generic' do
       win_agent = make_host('agent', :pe_ver => '2016.4.0', :platform => 'win-2008r2', :roles => ['frictionless'])
       hosts = [monolithic, agent, win_agent]
       expect(subject.determine_install_type(hosts, {})).to eq(:generic)
     end
+
+    it 'identifies a monolithic install with an external postgres node install as pe_managed_postgres' do
+      hosts = [monolithic, pe_postgres]
+      expect(subject.determine_install_type(hosts, {})).to eq(:pe_managed_postgres)
+    end
+
+    it 'identifies a split install with an external postgres node install as pe_managed_postgres' do
+      hosts = [master, puppetdb, console, pe_postgres]
+      expect(subject.determine_install_type(hosts, {})).to eq(:pe_managed_postgres)
+    end
+  end
+
+  describe 'do_install_pe_with_pe_managed_external_postgres' 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']) }
+
+    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)
+      allow(subject).to receive(:master).and_return(mono_master)
+      allow(subject).to receive(:database).and_return(mono_master)
+      allow(subject).to receive(:dashboard).and_return(mono_master)
+      allow(subject).to receive(:pe_postgres).and_return(pe_postgres)
+
+      allow(subject).to receive(:original_pe_ver).and_return('2017.2')
+      allow(subject).to receive(:prepare_host_installer_options).exactly(2).times
+      allow(subject).to receive(:setup_pe_conf).exactly(2).times
+
+      #installer command on master is called twice on install
+      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(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
+    end
+
+    it 'will do a monolithic upgrade 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)
+      allow(subject).to receive(:master).and_return(mono_master)
+      allow(subject).to receive(:database).and_return(mono_master)
+      allow(subject).to receive(:dashboard).and_return(mono_master)
+      allow(subject).to receive(:pe_postgres).and_return(pe_postgres)
+
+      allow(subject).to receive(:original_pe_ver).and_return('2016.4')
+      allow(subject).to receive(:prepare_host_installer_options).exactly(2).times
+      allow(subject).to receive(:setup_pe_conf).exactly(2).times
+
+      #installer command on master is only called once on upgrade
+      allow(subject).to receive(:execute_installer_cmd).with(mono_master, {}).once
+      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(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
+    end
+
+    it 'will do a split installation of PE with an external postgres that is managed by PE' do
+      allow(subject).to receive(:fetch_pe).with([split_master, split_database, split_console, pe_postgres], {}).and_return(true)
+      allow(subject).to receive(:master).and_return(split_master)
+      allow(subject).to receive(:database).and_return(split_database)
+      allow(subject).to receive(:dashboard).and_return(split_console)
+      allow(subject).to receive(:pe_postgres).and_return(pe_postgres)
+
+      allow(subject).to receive(:original_pe_ver).and_return('2017.2')
+      allow(subject).to receive(:prepare_host_installer_options).exactly(4).times
+      allow(subject).to receive(:setup_pe_conf).exactly(4).times
+
+      #installer command on master is called twice on install
+      allow(subject).to receive(:execute_installer_cmd).with(split_master, {}).twice
+      allow(subject).to receive(:execute_installer_cmd).with(split_database, {}).once
+      allow(subject).to receive(:execute_installer_cmd).with(split_console, {}).once
+      allow(subject).to receive(:execute_installer_cmd).with(pe_postgres, {}).once
+
+      allow(subject).to receive(:on).with(split_master, "puppet agent -t", :acceptable_exit_codes=>[0, 2]).once
+      allow(subject).to receive(:on).with(split_database, "puppet agent -t", :acceptable_exit_codes=>[0, 2]).once
+      allow(subject).to receive(:on).with(split_console, "puppet agent -t", :acceptable_exit_codes=>[0, 2]).once
+      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([split_master, split_database, split_console, pe_postgres], {}) }.not_to raise_error
+    end
+
+    it 'will do a split upgrade of PE with an external postgres that is managed by PE' do
+      allow(subject).to receive(:fetch_pe).with([split_master, split_database, split_console, pe_postgres], {}).and_return(true)
+      allow(subject).to receive(:master).and_return(split_master)
+      allow(subject).to receive(:database).and_return(split_database)
+      allow(subject).to receive(:dashboard).and_return(split_console)
+      allow(subject).to receive(:pe_postgres).and_return(pe_postgres)
+
+      allow(subject).to receive(:original_pe_ver).and_return('2016.4')
+      allow(subject).to receive(:prepare_host_installer_options).exactly(4).times
+      allow(subject).to receive(:setup_pe_conf).exactly(4).times
+
+      #installer command on master is called once on upgrade
+      allow(subject).to receive(:execute_installer_cmd).with(split_master, {}).once
+      allow(subject).to receive(:execute_installer_cmd).with(split_database, {}).once
+      allow(subject).to receive(:execute_installer_cmd).with(split_console, {}).once
+      allow(subject).to receive(:execute_installer_cmd).with(pe_postgres, {}).once
+
+      allow(subject).to receive(:on).with(split_master, "puppet agent -t", :acceptable_exit_codes=>[0, 2]).once
+      allow(subject).to receive(:on).with(split_database, "puppet agent -t", :acceptable_exit_codes=>[0, 2]).once
+      allow(subject).to receive(:on).with(split_console, "puppet agent -t", :acceptable_exit_codes=>[0, 2]).once
+      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([split_master, split_database, split_console, pe_postgres], {}) }.not_to raise_error
+    end
+  end
+
+  describe 'execute_installer_cmd' do
+    let(:mono_master) { make_host('mono_master', :pe_installer => 'pe_installer', :working_dir => "tmp/2014-07-01_15.27.53", :pe_ver => '2017.2', :platform => 'ubuntu-16.04-x86_64', :roles => ['master', 'database', 'dashboard']) }
+
+    it 'will call on with the installer command on the given host' do
+      allow(subject).to receive(:on).with(mono_master, "cd tmp/2014-07-01_15.27.53/ && ./pe_installer -y ")
+      expect{ subject.execute_installer_cmd(mono_master, {}) }.not_to raise_error
+    end
+  end
+
+  describe 'original_pe_ver' do
+    let(:master) { make_host('master', :platform => 'ubuntu-16.04-x86_64', :roles => ['master', 'database', 'dashboard']) }
+
+    it 'Returns the original pe ver when in upgrade situtaiton' do
+      subject.options = {:HOSTS => { 'master' => {:pe_ver => '2016.4.0'}}, :pe_ver => '2017.2'}
+      expect(subject.original_pe_ver(master)).to eq('2016.4.0')
+    end
+
+    it 'Returns the only pe ver when in non-upgrade sistuation' do
+      subject.options = {:HOSTS => { 'master' => {:pe_ver => '2017.2'}}, :pe_ver => '2017.2'}
+      expect(subject.original_pe_ver(master)).to eq('2017.2')
+    end
+  end
+
+  describe 'upgrading_to_pe_ver' do
+    let(:master) { make_host('master', :platform => 'ubuntu-16.04-x86_64', :roles => ['master', 'database', 'dashboard']) }
+
+    it 'Returns the upgrade pe ver when in upgrade situtaiton' do
+      subject.options = {:HOSTS => { 'master' => {:pe_upgrade_ver => '2017.3'}}, :pe_ver => '2017.2'}
+      expect(subject.upgrading_to_pe_ver(master)).to eq('2017.3')
+    end
+
+    it 'Returns just pe ver when no pe_upgrade_ver is set ' do
+      subject.options = {:HOSTS => { 'master' => {:pe_upgrade_ver => nil}}, :pe_ver => '2017.2'}
+      expect(subject.upgrading_to_pe_ver(master)).to eq('2017.2')
+    end
   end
 
   describe '#deploy_frictionless_to_master' do

metadata

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