beaker-pe 1.40.4 → 1.40.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 597fd875ea2da5aa9b624818fa7f10552cb66c64
-  data.tar.gz: 257d558b7feb908390579bf637617469d869e51c
+  metadata.gz: f3dfc737c0733b694f0e90688ad1ea579bce74a8
+  data.tar.gz: b3359e1711e60d6fe7244d5ae09424140fef3504
 SHA512:
-  metadata.gz: 10e1956290fc14deb5cef437b07d978ea6ec9eefa11171eacc8906225ac0ca98e41195f5837f3e02f87cc104c0df9c992592f141a9413efbee5bb4f403e0343b
-  data.tar.gz: ea0f3e48e2c20209a0dbafc70ce7d9ca05bb5572cc2a433e00f715729e92c4c263c80d11cec0000f6f27fcfff18605164138048c6aabef8578dab471f5d670cd
+  metadata.gz: 99e45b8fda8ccddf3fe6d2305041bba748c8c19ff3d679a0d00c3634ef0c5223c3d4293638441d225f5e2fcea7655db322347721d9fb8bb285230fd56534f76f
+  data.tar.gz: b87a2b68f1a7f89fbf0a4c425b4b5d92262c1486b8483acfe2d79377674dea52bcac1235dddf90b7e8a477431d83556ebbe761f60ee96d8557fd24e0dc35e8df

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

@@ -1111,8 +1111,11 @@ module Beaker
         # 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 }}
+          pe_version = hosts[0]['pe_ver']
+          if (!version_is_less(pe_version, '2018.1') && version_is_less(pe_version, '2018.1.999'))
+                if (hosts.any? {|h| h['roles'].include?('hub') || h['roles'].include?('spoke')})
+                  return {:answers => { 'pe_install::disable_mco' => false }}
+                end
           end
           return {}
         end

data/lib/beaker-pe/version.rb

@@ -3,7 +3,7 @@ module Beaker
     module PE
 
       module Version
-        STRING = '1.40.4'
+        STRING = '1.40.5'
       end
 
     end

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

@@ -1490,22 +1490,29 @@ describe ClassMixedWithDSLInstallUtils do
 
     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
+    it 'returns mco enabled for versions between 2018.1 and  2018.2' do
+      master['pe_ver'] = '2018.1.1'
+      hosts = [master, hub, spoke]
+      expect(subject.get_mco_setting(hosts)).to eq({:answers => {'pe_install::disable_mco' => false}})
+    end
+    it 'does not return anything for versions >= 2018.2' do
+      master['pe_ver'] = '2018.2.0'
+      hosts = [master, hub, spoke]
+      expect(subject.get_mco_setting(hosts)).to eq({})
+    end
+    it 'does not return anything for versions <  2018.1' do
+      master['pe_ver'] = '2017.3.7'
       hosts = [master, hub, spoke]
-      allow(subject).to receive(:version_is_less).and_return(false)
       expect(subject.get_mco_setting(hosts)).to eq({})
     end
   end

metadata

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