beaker-pe 1.40.0 → 1.40.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e428e5636faf6924ded6d1c00c1025cb31f5908f
-  data.tar.gz: 89c7cab90ff40da8ae815a3c691a09bd25871daf
+  metadata.gz: 3d2f3a830172fb8639723a327bbb42f4b2653c2c
+  data.tar.gz: 94c9fce23f9dc3c23a25e0c8f9b868247d6024ad
 SHA512:
-  metadata.gz: 27c581db08eb597e2d9064e6822d9240047c1e0800dfb61b64825dd0f460b4de4f489f52a6948e7472adaff4eb4cdbe4a96e838b3e6a616f29276bf632c7dbbc
-  data.tar.gz: 1380918dbc0c4ac49d44a672bafb0c4c7a6735d5bc53c992f8b6f1e6bf4b2c2f2d8f7e60be78f9bac2f3a5196dfb2eba8114ac2343cf1fdb5a00a9a12a3a970d
+  metadata.gz: 726297dc8a378882eecbb8e6432e087770e5cc5c4b52d3dbc911e57c72959e9df464c26c17ebad402501596c4c52d587f16d0da62dde56cf908e37c092f9ddb7
+  data.tar.gz: 21ea61bb695784c515e407ebc74f7d4fa971e74a6b1f090a1122a8733ac7901b193c1622e91a94624d6dbce7c90127811dd7b831fcff9ce93539f3e46f03699c

data/Gemfile

@@ -22,6 +22,8 @@ if ENV['GEM_SOURCE'] =~ /artifactory\.delivery\.puppetlabs\.net/
   gem "scooter", *location_for(ENV['SCOOTER_VERSION'] || '~> 3.0')
 end
 
+gem 'deep_merge'
+
 if File.exists? "#{__FILE__}.local"
   eval(File.read("#{__FILE__}.local"), binding)
 end

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

@@ -5,6 +5,7 @@ require 'beaker-pe/install/feature_flags'
 require "beaker-answers"
 require "timeout"
 require "json"
+require "deep_merge"
 module Beaker
   module DSL
     module InstallUtils
@@ -1106,6 +1107,16 @@ module Beaker
           Beaker::DSL::InstallUtils::FeatureFlags.new(opts).register_flags!
         end
 
+        # PE 2018.1.0 has mco disabled by default. If we are running hosts with
+        # roles hub or spoke then we intend to test mco. In this case we need
+        # to change a setting in pe.conf to allow mco to be enabled.
+        def get_mco_setting(hosts)
+          if(version_is_less('2018.1', hosts[0]['pe_ver']) && (hosts.any? {|h| h['roles'].include?('hub') || h['roles'].include?('spoke')}))
+            return {:answers => { 'pe_install::disable_mco' => false }}
+          end
+          return {}
+        end
+
         # Generates a Beaker Answers object for the passed *host* and creates
         # the answer or pe.conf configuration file on the *host* needed for
         # installation.
@@ -1119,6 +1130,9 @@ module Beaker
         # @param [Hash] opts The Beaker options hash
         # @return [BeakerAnswers::Answers] the generated answers object
         def generate_installer_conf_file_for(host, hosts, opts)
+          possible_mco_enabled_setting = get_mco_setting(hosts)
+          opts ||= {}
+          opts = possible_mco_enabled_setting.deep_merge(opts)
           beaker_answers_opts = setup_beaker_answers_opts(host, opts)
           answers = BeakerAnswers::Answers.create(
             opts[:pe_ver] || host['pe_ver'], hosts, beaker_answers_opts

data/lib/beaker-pe/version.rb

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

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

@@ -707,6 +707,7 @@ describe ClassMixedWithDSLInstallUtils do
         '/tmp/answers',
         %r{q_install=y.*q_puppetmaster_certname=#{master}}m
       )
+      expect(subject).to receive(:get_mco_setting).and_return({})
       subject.generate_installer_conf_file_for(master, hosts, opts)
     end
 
@@ -718,6 +719,7 @@ describe ClassMixedWithDSLInstallUtils do
         '/tmp/pe.conf',
         %r{\{.*"puppet_enterprise::puppet_master_host": "#{master.hostname}"}m
       )
+      expect(subject).to receive(:get_mco_setting).and_return({})
       subject.generate_installer_conf_file_for(master, hosts, opts)
     end
   end
@@ -1445,6 +1447,33 @@ describe ClassMixedWithDSLInstallUtils do
     end
   end
 
+  describe 'get_mco_setting' do
+    let(:master) { make_host('master', :pe_ver => '2018.1.0', :platform => 'ubuntu-16.04-x86_64', :roles => ['master', 'database', 'dashboard']) }
+    let(:hub) { make_host('agent', :pe_ver => '2018.1', :platform => 'el-7-x86_64', :roles => ['frictionless', 'hub', 'agent']) }
+    let(:spoke) { make_host('agent', :pe_ver => '2018.1', :roles => ['frictionless', 'spoke', 'agent']) }
+
+    it 'returns mco enabled with both hub and spoke and version is greater' do
+      hosts = [master, hub, spoke]
+      allow(subject).to receive(:version_is_less).and_return(true)
+      expect(subject.get_mco_setting(hosts)).to eq({:answers => {'pe_install::disable_mco' => false}})
+    end
+    it 'returns mco enabled with just hub and version is greater' do
+      hosts = [master, hub]
+      allow(subject).to receive(:version_is_less).and_return(true)
+      expect(subject.get_mco_setting(hosts)).to eq({:answers => {'pe_install::disable_mco' => false}})
+    end
+    it 'returns mco enabled with just spoke and version is greater' do
+      hosts = [master, spoke]
+      allow(subject).to receive(:version_is_less).and_return(true)
+      expect(subject.get_mco_setting(hosts)).to eq({:answers => {'pe_install::disable_mco' => false}})
+    end
+    it 'does not return anything if the version is less' do
+      hosts = [master, hub, spoke]
+      allow(subject).to receive(:version_is_less).and_return(false)
+      expect(subject.get_mco_setting(hosts)).to eq({})
+    end
+  end
+
   describe '#deploy_frictionless_to_master' do
     let(:master) { make_host('master', :pe_ver => '2017.2', :platform => 'ubuntu-16.04-x86_64', :roles => ['master', 'database', 'dashboard']) }
     let(:agent) { make_host('agent', :pe_ver => '2017.2', :platform => 'el-7-x86_64', :roles => ['frictionless']) }
@@ -1488,6 +1517,7 @@ describe ClassMixedWithDSLInstallUtils do
     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)
       allow( subject ).to receive( :on ).and_return( Beaker::Result.new( {}, '' ) )
       allow( subject ).to receive( :fetch_pe ).and_return( true )
@@ -1560,6 +1590,7 @@ describe ClassMixedWithDSLInstallUtils do
         :roles => ['agent']
       }, 1)
       opts[:masterless] = true
+      expect(subject).to receive(:get_mco_setting).and_return({})
 
       allow( subject ).to receive( :verify_network_resources).with(hosts, nil)
       allow( subject ).to receive( :hosts ).and_return( hosts )
@@ -1747,6 +1778,7 @@ describe ClassMixedWithDSLInstallUtils do
       hosts[0][:roles] = ['master', 'database', 'dashboard']
       hosts[1][:platform] = Beaker::Platform.new('el-6-x86_64')
       opts[:HOSTS] = {}
+      expect(subject).to receive(:get_mco_setting).and_return({})
       hosts.each do |host|
         opts[:HOSTS][host.name] = host
       end

metadata

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