beaker-pe 2.11.6 → 2.11.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e607f0adbf9ab049934cd0ce8b147e60e63fe642aa2cb78cbb92db28c72dc97b
-  data.tar.gz: 3f51752866e156e61b75d9fbca4f1d00cc916f68f7c197fd089d1cc5069649d0
+  metadata.gz: 2729fa197d07e6977316382ea5621a152a0d740a19b1bd8639101867384eb15f
+  data.tar.gz: 434680a7743f98182d0a2261c5151b204bd1e0439cf4532ce249bdfb93e2ac14
 SHA512:
-  metadata.gz: 337a4164bcc7d6a5e73e515ee4b277a11b1a08524cda7158226303a229b962e4a65072aa2b51e968658580c8784c8f9ae25940e79c31e863c94b414a6096438a
-  data.tar.gz: 81e2989aa75682be94555e98273ce477d71384bdaa55ccbcc3a12d42030d512b6ed3382e04e0aa1d12fc447cd5c0e23f4b7a1dd4da67a1bbdabacc15da6606e7
+  metadata.gz: 024973babe90a837c4c86b3efecfe5792dc1610eae356a3e05abd54ecafb529640b616923aa674e51c125a4bd4405b67ab15dfaac82f391a9aa7a1cbafb5513c
+  data.tar.gz: 884e05b5a6a9e0c0a43420f5fa71bd5c805cc641d2b5cf5bcd3ff9eb2f359bd239c297d93e2405cad89bd06805430006d59666fb4903e9a44d78da9905f9341a

data/CODEOWNERS

@@ -1,4 +1,5 @@
-#This Repository is maintained by both the beaker and installer teams, depending on the location of the changes
+#This Repository is maintained by both the beaker, installer, and Night's Watch teams, depending on the location of the changes
 * @puppetlabs/beaker
 /lib/beaker-pe/install @puppetlabs/installer-and-management
+/lib/beaker-pe/pe-client-tools @puppetlabs/night-s-watch
 /spec/beaker-pe/install @puppetlabs/installer-and-management

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

@@ -6,7 +6,6 @@ require "beaker-answers"
 require "timeout"
 require "json"
 require "deep_merge"
-
 module Beaker
   module DSL
     module InstallUtils
@@ -582,6 +581,8 @@ module Beaker
             do_install_pe_with_pe_managed_external_postgres(hosts,opts)
           when :simple_monolithic
             simple_monolithic_install(hosts.first, hosts.drop(1), opts)
+          when :simple_monolithic_install_with_preload
+            simple_monolithic_install_with_preload(hosts.first, hosts.drop(1), opts)
           when :simple_split
             # This isn't implemented yet, so just do a generic install instead
             #simple_split_install(hosts, opts)
@@ -628,7 +629,11 @@ module Beaker
 
           mono_roles = ['master', 'database', 'dashboard']
           if has_all_roles?(hosts.first, mono_roles) && hosts.drop(1).all? {|host| host['roles'].include?('frictionless')}
-            :simple_monolithic
+            if hosts.first['template'] =~ /-preload/ && opts[:type] != :upgrade
+              :simple_monolithic_install_with_preload
+            else
+              :simple_monolithic
+            end
           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')}
@@ -661,7 +666,7 @@ module Beaker
           register_feature_flags!(opts)
           generate_installer_conf_file_for(master, all_hosts, opts)
           step "Install PE on master" do
-            on master, installer_cmd(master, opts) if master['template'] !~ /-preload/
+            on master, installer_cmd(master, opts)
           end
 
           step "Stop agent on master" do
@@ -683,6 +688,37 @@ module Beaker
           end
         end
 
+        # Configure PE on a monolithic master and some number of frictionless agents if a node is using a PE preloaded image for the master node.
+        # @param [Host] master The node to configure the master on
+        # @param [Array<Host>] agents The nodes to install agents on
+        # @param [Hash{Symbol=>Symbol, String}] opts The options for how to install or upgrade PE
+        #
+        # @example
+        #   simple_monolithic_install_with_preload(master, agents, {:type => :install, :pe_ver => '2017.2.0'})
+        #
+        # @return nil
+        #
+        # @api private
+        def simple_monolithic_install_with_preload(master, agents, opts={})
+          step "Performing a standard monolithic install with frictionless agents on a preloaded image"
+          all_hosts = [master, *agents]
+          configure_type_defaults_on([master])
+
+          # Set PE distribution on the agents, creates working directories
+          prepare_hosts(all_hosts, opts)
+          register_feature_flags!(opts)
+          generate_installer_conf_file_for(master, all_hosts, opts)
+
+          step "Stop agent on master" do
+            stop_agent_on(master)
+          end
+
+          if manage_puppet_service?(master[:pe_ver], options)
+            configure_puppet_agent_service(:ensure => 'stopped', :enabled => false)
+          end
+
+          install_agents_only_on(agents, opts)
+        end
 
         # Configure the master to use a proxy and drop unproxied connections
         def config_hosts_for_proxy_access hosts

data/lib/beaker-pe/version.rb

@@ -3,7 +3,7 @@ module Beaker
     module PE
 
       module Version
-        STRING = '2.11.6'
+        STRING = '2.11.7'
       end
 
     end

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

@@ -1621,6 +1621,13 @@ describe ClassMixedWithDSLInstallUtils do
       subject.do_install([])
     end
 
+    it 'chooses to do a simple monolithic install with preload when appropriate' do
+      expect(subject).to receive(:simple_monolithic_install_with_preload)
+      allow(subject).to receive(:determine_install_type).and_return(:simple_monolithic_install_with_preload)
+
+      subject.do_install([])
+    end
+
     it 'can perform a simple installation' do
       expect(subject).to receive(:get_mco_setting).and_return({})
       allow( subject ).to receive( :verify_network_resources).with(hosts, nil)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-pe
 version: !ruby/object:Gem::Version
-  version: 2.11.6
+  version: 2.11.7
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-22 00:00:00.000000000 Z
+date: 2020-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec