beaker-pe 1.39.0 → 1.40.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc167d062d00e928c3edab27aba88917f54740c0
-  data.tar.gz: be559e84df01d94b0476d6cd8ffa016f8e9a553e
+  metadata.gz: e428e5636faf6924ded6d1c00c1025cb31f5908f
+  data.tar.gz: 89c7cab90ff40da8ae815a3c691a09bd25871daf
 SHA512:
-  metadata.gz: 4be7886aef369fad8961946989a0f62e8de2a27fce265d23067fcaa8226b06b0d6988611e3f8fca5ae4300e76a51f52e7fdd6ea6d560185ace4b2c6c65e26e1d
-  data.tar.gz: ad0d95afca16cb36b9d7c492d29d2430ce002d2298cac88d328d107f53542e9cf7359daed05117b4a6d8d777140d77cd0de0dcb7988c23f6532906d66d9982df
+  metadata.gz: 27c581db08eb597e2d9064e6822d9240047c1e0800dfb61b64825dd0f460b4de4f489f52a6948e7472adaff4eb4cdbe4a96e838b3e6a616f29276bf632c7dbbc
+  data.tar.gz: 1380918dbc0c4ac49d44a672bafb0c4c7a6735d5bc53c992f8b6f1e6bf4b2c2f2d8f7e60be78f9bac2f3a5196dfb2eba8114ac2343cf1fdb5a00a9a12a3a970d

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

@@ -20,7 +20,7 @@ module Beaker::DSL::InstallUtils
   #     }
   #   }
   #
-  # All flag keys are expected to be downcased with hyphens.
+  # All flag keys are expected to be downcased with underscores.
   #
   # Environment variables may be uppercased.
   class FeatureFlags

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

@@ -28,12 +28,15 @@ module Beaker
         MEEP_CUTOVER_VERSION = '2016.2.0'
         # Version of PE when we switched to using meep for classification
         # instead of PE node groups
-        MEEP_CLASSIFICATION_VERSION = '2017.2.0'
+        MEEP_CLASSIFICATION_VERSION = '2018.2.0'
         # PE-18799 temporary default used for meep classification check while
         # we navigate the switchover.
         # PE-18718 switch flag to true once beaker-pe, beaker-answers,
         # beaker-pe-large-environments and pe_acceptance_tests are ready
         DEFAULT_MEEP_CLASSIFICATION = false
+        # Version of PE in which PE is managing the agent service
+        MANAGE_PUPPET_SERVICE_VERSION = '2018.1.0'
+
         MEEP_DATA_DIR = '/etc/puppetlabs/enterprise'
         PE_CONF_FILE = "#{MEEP_DATA_DIR}/conf.d/pe.conf"
         NODE_CONF_PATH = "#{MEEP_DATA_DIR}/conf.d/nodes"
@@ -394,7 +397,9 @@ module Beaker
         def deploy_frictionless_to_master(host)
           return if use_meep_for_classification?(master[:pe_ver], options)
 
-          platform = host['platform']
+          # For some platforms (e.g, redhatfips), packaging_platfrom is set and should
+          # be used as the primary source of truth for the platform string.
+          platform = host['packaging_platform'] || host['platform']
 
           # We don't have a separate AIX 7.2 build, so it is
           # classified as 7.1 for pe_repo purposes
@@ -605,6 +610,7 @@ module Beaker
           prepare_hosts(all_hosts, opts)
           fetch_pe([master], opts)
           prepare_host_installer_options(master)
+          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)
@@ -614,6 +620,10 @@ module Beaker
             stop_agent_on(master)
           end
 
+          if manage_puppet_service?(master[:pe_ver], options)
+            configure_puppet_agent_service(:ensure => 'stopped', :enabled => false)
+          end
+
           step "Run puppet to setup mcollective and pxp-agent" do
             on(master, puppet_agent('-t'), :acceptable_exit_codes => [0,2])
           end
@@ -812,8 +822,7 @@ module Beaker
               on dashboard, "/opt/puppet/bin/rake -sf /opt/puppet/share/puppet-dashboard/Rakefile #{task} RAILS_ENV=production"
             end
 
-            # PE-18799 replace the version_is_less with a use_meep_for_classification? test
-            if use_meep_for_classification?(master[:pe_ver], options)
+            if manage_puppet_service?(master[:pe_ver], options)
               configure_puppet_agent_service(:ensure => 'stopped', :enabled => false)
             end
 
@@ -955,13 +964,33 @@ module Beaker
           on non_infrastructure, puppet_agent('-t'), :acceptable_exit_codes => [0,2], :run_in_parallel => true
         end
 
+        # Whether or not PE should be managing the puppet service on agents.
+        # Puppet code to manage the puppet service was added to the next branches
+        # and is slated to be merged into 2018.1.x
+        #
+        # Returns true if the version we are managing is greater than or equal to
+        # MANAGE_PUPPET_SERVICE_VERSION.
+        #
+        # Temporarily, (until merged from 'next' branches into 2018.1.x), also checks
+        # the pe_modules_next flag to know whether or not the code for managing puppet
+        # service is present.
+        def manage_puppet_service?(version, opts)
+          # PE-23651 remove vv
+          register_feature_flags!(opts)
+
+          temporary_flag = !!feature_flag?('pe_modules_next', opts)
+          # ^^
+
+          !version_is_less(version, MANAGE_PUPPET_SERVICE_VERSION) && temporary_flag
+        end
+
         # True if version is greater than or equal to MEEP_CLASSIFICATION_VERSION
         # (PE-18718) AND the temporary feature flag is true.
         #
-        # The temporary feature flag is pe_modules_next and can be set in
+        # The temporary feature flag is meep_classification and can be set in
         # the :answers hash given in beaker's host.cfg, inside a feature_flags
         # hash. It will also be picked up from the environment as
-        # PE_MODULES_NEXT. (See register_feature_flags!())
+        # MEEP_CLASSIFICATION. (See register_feature_flags!())
         #
         # The :answers hash value will take precedence over the env variable.
         #
@@ -973,7 +1002,7 @@ module Beaker
           # PE-19470 remove vv
           register_feature_flags!(opts)
 
-          temporary_flag = feature_flag?('pe_modules_next', opts)
+          temporary_flag = feature_flag?('meep_classification', opts)
           temporary_flag = DEFAULT_MEEP_CLASSIFICATION if temporary_flag.nil?
           # ^^
 
@@ -1039,8 +1068,13 @@ module Beaker
 
           modified_opts = opts.merge(beaker_answers_opts)
 
-          if feature_flag?('pe_modules_next', opts) && !modified_opts.include?(:meep_schema_version)
-            modified_opts[:meep_schema_version] = '2.0'
+          answers_hash = modified_opts[:answers] ||= {}
+          if !answers_hash.include?(:meep_schema_version)
+            if feature_flag?(:meep_classification, opts)
+              answers_hash[:meep_schema_version] = '2.0'
+            elsif use_meep?(host['pe_ver'])
+              answers_hash[:meep_schema_version] = '1.0'
+            end
           end
 
           modified_opts
@@ -1520,7 +1554,7 @@ module Beaker
           get_console_dispatcher_for_beaker_pe(true)
         end
 
-        # In PE versions >= 2017.1.0, allows you to configure the puppet agent
+        # In PE versions >= 2018.1.0, allows you to configure the puppet agent
         # service for all nodes.
         #
         # @param parameters [Hash] - agent profile parameters
@@ -1531,7 +1565,7 @@ module Beaker
         #   enabled (for restarts)
         # @raise [StandardError] if master version is less than 2017.1.0
         def configure_puppet_agent_service(parameters)
-          raise(StandardError, "Can only manage puppet service in PE versions >= 2017.1.0; tried for #{master['pe_ver']}") if version_is_less(master['pe_ver'], '2017.1.0')
+          raise(StandardError, "Can only manage puppet service in PE versions >= #{MANAGE_PUPPET_SERVICE_VERSION}; tried for #{master['pe_ver']}") if version_is_less(master['pe_ver'], MANAGE_PUPPET_SERVICE_VERSION)
           puppet_managed = parameters.include?(:managed) ? parameters[:managed] : true
           puppet_ensure = parameters[:ensure]
           puppet_enabled = parameters[:enabled]
@@ -1543,30 +1577,17 @@ module Beaker
           step msg do
             # PE-18799 and remove this conditional
             if use_meep_for_classification?(master[:pe_ver], options)
-              group_name = 'Puppet Enterprise Agent'
               class_name = 'pe_infrastructure::agent'
             else
-              group_name = 'PE Agent'
               class_name = 'puppet_enterprise::profile::agent'
             end
 
             # update pe conf
-            # only the pe_infrastructure::agent parameters are relevant in pe.conf
             update_pe_conf({
-              "pe_infrastructure::agent::puppet_service_managed" => puppet_managed,
-              "pe_infrastructure::agent::puppet_service_ensure" => puppet_ensure,
-              "pe_infrastructure::agent::puppet_service_enabled" => puppet_enabled,
+              "#{class_name}::puppet_service_managed" => puppet_managed,
+              "#{class_name}::puppet_service_ensure" => puppet_ensure,
+              "#{class_name}::puppet_service_enabled" => puppet_enabled,
             })
-
-            if _console_dispatcher = get_console_dispatcher_for_beaker_pe
-              agent_group = _console_dispatcher.get_node_group_by_name(group_name)
-              agent_class = agent_group['classes'][class_name]
-              agent_class['puppet_service_managed'] = puppet_managed
-              agent_class['puppet_service_ensure'] = puppet_ensure
-              agent_class['puppet_service_enabled'] = puppet_enabled
-
-              _console_dispatcher.update_node_group(agent_group['id'], agent_group)
-            end
           end
         end
 

data/lib/beaker-pe/version.rb

@@ -3,7 +3,7 @@ module Beaker
     module PE
 
       module Version
-        STRING = '1.39.0'
+        STRING = '1.40.0'
       end
 
     end

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

@@ -605,14 +605,14 @@ describe ClassMixedWithDSLInstallUtils do
     end
   end
 
-  describe 'use_meep_for_classification?' do
+  RSpec.shared_examples 'test flag' do |flag_name|
     let(:feature_flag) { nil }
     let(:environment_feature_flag) { nil }
     let(:answers) do
       {
         :answers => {
           'feature_flags' => {
-            'pe_modules_next' => feature_flag,
+            flag_name => feature_flag,
           },
         },
       }
@@ -627,60 +627,76 @@ describe ClassMixedWithDSLInstallUtils do
     before(:each) do
       subject.options = options
       if !environment_feature_flag.nil?
-        ENV['PE_MODULES_NEXT'] = environment_feature_flag
+        ENV[flag_name.upcase] = environment_feature_flag
       end
     end
 
     after(:each) do
-      ENV.delete('PE_MODULES_NEXT')
+      ENV.delete(flag_name.upcase)
     end
 
-    it { expect(subject.use_meep_for_classification?('2017.1.0', options)).to eq(false) }
-    it { expect(subject.use_meep_for_classification?('2017.2.0', options)).to eq(false) }
+    it { expect(subject.send(method, old_behavior_version, options)).to eq(false) }
+    it { expect(subject.send(method, threshold_version, options)).to eq(false) }
 
     context 'feature flag false' do
       let(:feature_flag) { false }
 
-      it { expect(subject.use_meep_for_classification?('2017.1.0', options)).to eq(false) }
-      it { expect(subject.use_meep_for_classification?('2017.2.0', options)).to eq(false) }
+      it { expect(subject.send(method, old_behavior_version, options)).to eq(false) }
+      it { expect(subject.send(method, threshold_version, options)).to eq(false) }
     end
 
     context 'feature flag true' do
       let(:feature_flag) { true }
 
-      it { expect(subject.use_meep_for_classification?('2017.1.0', options)).to eq(false) }
-      it { expect(subject.use_meep_for_classification?('2017.2.0', options)).to eq(true) }
+      it { expect(subject.send(method, old_behavior_version, options)).to eq(false) }
+      it { expect(subject.send(method, threshold_version, options)).to eq(true) }
     end
 
     context 'environment feature flag true' do
       let(:environment_feature_flag) { 'true' }
 
-      it { expect(subject.use_meep_for_classification?('2017.1.0', options)).to eq(false) }
-      it { expect(subject.use_meep_for_classification?('2017.2.0', options)).to eq(true) }
+      it { expect(subject.send(method, old_behavior_version, options)).to eq(false) }
+      it { expect(subject.send(method, threshold_version, options)).to eq(true) }
 
       context 'answers feature flag false' do
         let(:feature_flag) { false }
 
-        it { expect(subject.use_meep_for_classification?('2017.1.0', options)).to eq(false) }
-        it { expect(subject.use_meep_for_classification?('2017.2.0', options)).to eq(false) }
+        it { expect(subject.send(method, old_behavior_version, options)).to eq(false) }
+        it { expect(subject.send(method, threshold_version, options)).to eq(false) }
       end
     end
 
     context 'environment feature flag false' do
       let(:environment_feature_flag) { 'false' }
 
-      it { expect(subject.use_meep_for_classification?('2017.1.0', options)).to eq(false) }
-      it { expect(subject.use_meep_for_classification?('2017.2.0', options)).to eq(false) }
+      it { expect(subject.send(method, old_behavior_version, options)).to eq(false) }
+      it { expect(subject.send(method, threshold_version, options)).to eq(false) }
 
       context 'answers feature flag true' do
         let(:feature_flag) { true }
 
-        it { expect(subject.use_meep_for_classification?('2017.1.0', options)).to eq(false) }
-        it { expect(subject.use_meep_for_classification?('2017.2.0', options)).to eq(true) }
+        it { expect(subject.send(method, old_behavior_version, options)).to eq(false) }
+        it { expect(subject.send(method, threshold_version, options)).to eq(true) }
       end
     end
   end
 
+  describe 'use_meep_for_classification?' do
+    let(:old_behavior_version) { '2018.1.0' }
+    let(:threshold_version) { '2018.2.0' }
+    let(:method) { 'use_meep_for_classification?' }
+
+    include_examples('test flag', 'meep_classification')
+  end
+
+  describe 'manage_puppet_service?' do
+    let(:old_behavior_version) { '2017.3.0' }
+    let(:threshold_version) { '2018.1.0' }
+    let(:method) { 'manage_puppet_service?' }
+
+    include_examples('test flag', 'pe_modules_next')
+  end
+
   describe 'generate_installer_conf_file_for' do
     let(:master) { hosts.first }
 
@@ -814,6 +830,7 @@ describe ClassMixedWithDSLInstallUtils do
           opts.merge(
             :format => :bash,
             :include_legacy_database_defaults => false,
+            :answers => {},
           )
         )
       end
@@ -829,6 +846,7 @@ describe ClassMixedWithDSLInstallUtils do
           opts.merge(
             :format => :hiera,
             :include_legacy_database_defaults => false,
+            :answers => { :meep_schema_version => '1.0' },
           )
         )
       end
@@ -844,12 +862,44 @@ describe ClassMixedWithDSLInstallUtils do
           )
         end
 
-        it 'adds meep_schema_version' do
+        it 'sets meep_schema_version 1.0' do
           expect(subject.setup_beaker_answers_opts(host, options)).to eq(
             options.merge(
               :format => :hiera,
               :include_legacy_database_defaults => false,
-              :meep_schema_version => '2.0',
+              :answers => {
+                :feature_flags => {
+                  :pe_modules_next => true
+                },
+                :meep_schema_version => '1.0',
+              }
+            )
+          )
+        end
+      end
+
+      context 'with meep-classification' do
+        let(:options) do
+          opts.merge(
+            :answers => {
+              :feature_flags => {
+                :meep_classification => true
+              }
+            }
+          )
+        end
+
+        it 'adds meep_schema_version 2.0' do
+          expect(subject.setup_beaker_answers_opts(host, options)).to eq(
+            options.merge(
+              :format => :hiera,
+              :include_legacy_database_defaults => false,
+              :answers => {
+                :feature_flags => {
+                  :meep_classification => true
+                },
+                :meep_schema_version => '2.0',
+              }
             )
           )
         end
@@ -866,6 +916,9 @@ describe ClassMixedWithDSLInstallUtils do
               opts.merge(
                 :format => :hiera,
                 :include_legacy_database_defaults => false,
+                :answers => {
+                  :meep_schema_version => '1.0',
+                }
               )
             )
           end
@@ -878,6 +931,9 @@ describe ClassMixedWithDSLInstallUtils do
               opts.merge(
                 :format => :hiera,
                 :include_legacy_database_defaults => true,
+                :answers => {
+                  :meep_schema_version => '1.0',
+                }
               )
             )
           end
@@ -2288,7 +2344,7 @@ describe ClassMixedWithDSLInstallUtils do
   end
 
   describe 'configure_puppet_agent_service' do
-    let(:pe_version) { '2017.1.0' }
+    let(:pe_version) { '2018.1.0' }
     let(:master) { hosts[0] }
 
     before(:each) do
@@ -2300,17 +2356,17 @@ describe ClassMixedWithDSLInstallUtils do
       expect { subject.configure_puppet_agent_service }.to raise_error(ArgumentError, /wrong number/)
     end
 
-    context 'master prior to 2017.1.0' do
+    context 'master prior to 2018.1.0' do
       let(:pe_version) { '2016.5.1' }
 
       it 'raises an exception about version' do
         expect { subject.configure_puppet_agent_service({}) }.to(
-          raise_error(StandardError, /Can only manage.*2017.1.0; tried.* 2016.5.1/)
+          raise_error(StandardError, /Can only manage.*2018.1.0; tried.* 2016.5.1/)
         )
       end
     end
 
-    context '2017.1.0 master' do
+    context '2018.1.0 master' do
       let(:pe_conf_path) { '/etc/puppetlabs/enterprise/conf.d/pe.conf' }
       let(:pe_conf) do
         <<-EOF
@@ -2324,18 +2380,13 @@ describe ClassMixedWithDSLInstallUtils do
 "node_roles": {
   "pe_role::monolithic::primary_master": ["#{master.name}"],
 }
-"pe_infrastructure::agent::puppet_service_managed": true
-"pe_infrastructure::agent::puppet_service_ensure": "stopped"
-"pe_infrastructure::agent::puppet_service_enabled": false
+"puppet_enterprise::profile::agent::puppet_service_managed": true
+"puppet_enterprise::profile::agent::puppet_service_ensure": "stopped"
+"puppet_enterprise::profile::agent::puppet_service_enabled": false
         EOF
       end
 
       it "modifies the agent puppet service settings in pe.conf" do
-        # mock hitting the console
-        dispatcher = double('dispatcher').as_null_object
-        expect(subject).to receive(:get_console_dispatcher_for_beaker_pe)
-          .and_return(dispatcher)
-
         assert_meep_conf_edit(pe_conf, gold_pe_conf, pe_conf_path) do
           subject.configure_puppet_agent_service(:ensure => 'stopped', :enabled => false)
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-pe
 version: !ruby/object:Gem::Version
-  version: 1.39.0
+  version: 1.40.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-23 00:00:00.000000000 Z
+date: 2018-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec