beaker-puppet_install_helper 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8238bf66282860a17d554708397faf4d2e6a0adb
-  data.tar.gz: fb006b5ca3e07a31fed44ddaba759fbb7c0f46c5
+  metadata.gz: 7b3d3a1e3151b4148cdb24e298c8e89ad4d0e6cf
+  data.tar.gz: f200b28636bf0f7e4fae22c56255d82155183b4b
 SHA512:
-  metadata.gz: 9914f24a37f7d8e58f62f47d9759a893dd791a81e69d5e41bd4fd1e9932673eaa2f2cc18cd0d99113c19d40a0a7fb612ee0dbaa91b96127dc226bf8942774b1d
-  data.tar.gz: c3bb58813e192fd100ea2fabc651f7c480fae854316b8cd171d8b4a0870b141041677c2a21a256e5bc246f0f8c58b36f6846f5b204b6ff50dfaebbff808a7932
+  metadata.gz: d5ee9086a1545129ed9e0aea4b3c3eb1c687fa6381197f102a251162d33b4dbbf1224813c408588701d6c192ac0d8b16a171b8c2898b0bb9b9f756eba9bee4ea
+  data.tar.gz: ce04589ec9651e3acb833cb9e958fd90ab93456da26509614e36933f82891b20b5d656f6e45c03b7c9940a581eac0873defff92ee327de208ff7e92e42fa5daf

data/beaker-puppet_install_helper.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = "beaker-puppet_install_helper"
-  s.version     = '0.4.2'
+  s.version     = '0.4.3'
   s.authors     = ["Puppetlabs"]
   s.email       = ["hunter@puppetlabs.com"]
   s.homepage    = "https://github.com/puppetlabs/beaker-puppet_install_helper"

data/lib/beaker/ca_cert_helper.rb

@@ -19,13 +19,15 @@ module Beaker::CaCertHelper
   ##
   def install_ca_certs_on(hosts)
     [hosts].flatten.each do |host|
-      get_cert_hash.each do |cert_name, ca|
-        if host['platform'] =~ /windows/i
-          create_cert_on_host(host, cert_name, ca)
-          add_windows_cert host, cert_name
-        elsif host['platform'] =~ /solaris/i
-          create_cert_on_host(host, cert_name, ca)
-          add_solaris_cert host, cert_name
+      if host['pe_ver'] and version_is_less(host['pe_ver'], '4.0.0')
+        get_cert_hash.each do |cert_name, ca|
+          if host['platform'] =~ /windows/i
+            create_cert_on_host(host, cert_name, ca)
+            add_windows_cert host, cert_name
+          elsif host['platform'] =~ /solaris/i
+            create_cert_on_host(host, cert_name, ca)
+            add_solaris_cert host, cert_name
+          end
         end
       end
     end

data/lib/beaker/puppet_install_helper.rb

@@ -44,11 +44,9 @@ module Beaker::PuppetInstallHelper
 
     case type
     when "pe"
-      # This will skip hosts that are not supported
+      # These will skip hosts that are not supported
       install_pe_on(Array(hosts),options.merge({"pe_ver" => version}))
-      if version and version_is_less(version, '4.0.0')
-        install_ca_certs_on(Array(hosts))
-      end
+      install_ca_certs_on(Array(hosts))
     when "foss"
       opts = options.merge({
         :version        => version,

data/spec/unit/beaker/ca_cert_helper_spec.rb

@@ -17,7 +17,7 @@ describe 'beaker::ca_cert_helper' do
     end
 
     it "windows 2003 node" do
-      w2k3 = {"platform" => 'windows-2003r2-64', 'distmoduledir' => '/dne', 'hieraconf' => '/dne'}
+      w2k3 = {"pe_ver" => "3.8.3", "platform" => 'windows-2003r2-64', 'distmoduledir' => '/dne', 'hieraconf' => '/dne'}
 
       expect(subject).to receive(:add_windows_cert).with(w2k3, 'geotrustglobal.pem')
       expect(subject).to receive(:create_cert_on_host).with(w2k3, 'geotrustglobal.pem', 'my cert string')
@@ -27,7 +27,7 @@ describe 'beaker::ca_cert_helper' do
     end
 
     it "solaris 11 node" do
-      sol = {"platform" => 'solaris-11-x86_64', 'distmoduledir' => '/dne', 'hieraconf' => '/dne'}
+      sol = {"pe_ver" => "3.8.3", "platform" => 'solaris-11-x86_64', 'distmoduledir' => '/dne', 'hieraconf' => '/dne'}
 
       expect(subject).to receive(:add_solaris_cert).with(sol, 'geotrustglobal.pem')
       expect(subject).to receive(:create_cert_on_host).with(sol, 'geotrustglobal.pem', 'my cert string')

data/spec/unit/beaker/puppet_install_helper_spec.rb

@@ -9,7 +9,9 @@ describe 'beaker::puppet_install_helper' do
     pe_host = double(:is_pe? => true)
     allow(foss_host).to receive(:[]).with("distmoduledir").and_return("/dne")
     allow(foss_host).to receive(:[]).with("platform").and_return("Debian")
+    allow(foss_host).to receive(:[]).with("pe_ver").and_return(nil)
     allow(foss_host).to receive(:puppet).and_return({"hiera_config" => "/dne"})
+    allow(pe_host).to receive(:[]).with("pe_ver").and_return("3.8.3")
     allow(pe_host).to receive(:[]).with("distmoduledir").and_return("/dne")
     allow(pe_host).to receive(:[]).with("platform").and_return("Debian")
     allow(pe_host).to receive(:puppet).and_return({"hiera_config" => "/dne"})
@@ -98,7 +100,7 @@ describe 'beaker::puppet_install_helper' do
         subject.run_puppet_install_helper_on(hosts)
       end
       it "installs certs on PE 3 solaris" do
-        sol = {"platform" => 'solaris-11-64', 'distmoduledir' => '/dne','hieraconf' => '/dne'}
+        sol = {"pe_ver" => "3.8.3", "platform" => 'solaris-11-64', 'distmoduledir' => '/dne','hieraconf' => '/dne'}
         hosts = [ sol ]
         ENV["PUPPET_INSTALL_TYPE"] = "pe"
         ENV["PUPPET_INSTALL_VERSION"] = "3.8.1"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-puppet_install_helper
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-10 00:00:00.000000000 Z
+date: 2016-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec