beaker-puppet_install_helper 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bfd5c439c7716c6e608e803b8b233c871a6added
-  data.tar.gz: 51ad611cb0b5d67beb392d51914e221ab6c4ca1f
+  metadata.gz: be59c64ddf1bbf2d6467a1dcf22efb203441323b
+  data.tar.gz: e838e73da0145c0f8181572ca105114c1189acca
 SHA512:
-  metadata.gz: 57d559f50199430bffa0fa7565a161cfd62395e24f335935d8c192b46c3a08cab4abd4c8b20cbd6d80c4e936ad99d17dee193a27cb6c1f1d9b86acff5153fcc5
-  data.tar.gz: 981118b529218403ab27707c1e0fc2e6d1c5a176a9face7c9f0e15ad440f77b435a125b17231ee394e90d2c7f173d6d9e8d42d403199346667707e2a6503db79
+  metadata.gz: 04bb1747fd6ca6591807da4b9fc0785d2a3a0a178b114034de7621a04053998e51699e55c20012d9871cb1c56c9e456e04fc35c7ee8a9285ec978a7c4d057d24
+  data.tar.gz: 3b1c6beed2aa8f5fc2f0b2242d4e4a5cf5847d5e71e420c225c6f7c8b98b93c6ad46925baa2487865a1b63ff649d16af39858c76ff8c2f835435b0ec5318c0c6

data/beaker-puppet_install_helper.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = "beaker-puppet_install_helper"
-  s.version     = '0.3.1'
+  s.version     = '0.4.0'
   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

@@ -15,11 +15,13 @@ module Beaker::CaCertHelper
   #
   ##
   def install_ca_certs_on(hosts)
-    Array[hosts].each do |host|
+    [hosts].flatten.each do |host|
       get_cert_hash.each do |cert_name, ca|
         create_cert_on_host(host, cert_name, ca)
         if host['platform'] =~ /windows/i
           add_windows_cert host, cert_name
+        elsif host['platform'] =~ /solaris/i
+          add_solaris_cert host, cert_name
         end
       end
     end
@@ -40,6 +42,14 @@ module Beaker::CaCertHelper
     on host, "cmd /c certutil -v -addstore Root `cygpath -w #{ca_filename}`"
   end
 
+  ##
+  # Install cert, assumes cygwin currently
+  ##
+  def add_solaris_cert(host, ca_filename)
+    on host, "echo '# #{ca_filename}' >> /opt/puppet/ssl/cert.pem"
+    on host, "cat #{ca_filename} >> /opt/puppet/ssl/cert.pem"
+  end
+
   ##
   # Returns a hash of certificates where the Key is the pem cert name, and the value is the certificate
   # @return Hash<String,String>
@@ -126,4 +136,4 @@ A4GBAFjOKer89961zgK5F7WF0bnj4JXMJTENAKaSbn+2kmOeUJXRmm/kEd5jhW6Y
 
 end
 
-include Beaker::CaCertHelper
+include Beaker::CaCertHelper

data/spec/unit/beaker/ca_cert_helper_spec.rb

@@ -22,6 +22,16 @@ describe 'beaker::ca_cert_helper' do
       expect(subject).to receive(:create_cert_on_host).with(w2k3, 'usertrust-network.pem', 'my user trust cert')
       subject.install_ca_certs_on w2k3
     end
+
+    it "solaris 11 node" do
+      sol = {"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')
+      expect(subject).to receive(:add_solaris_cert).with(sol, 'usertrust-network.pem')
+      expect(subject).to receive(:create_cert_on_host).with(sol, 'usertrust-network.pem', 'my user trust cert')
+      subject.install_ca_certs_on sol
+    end
   end
 
   describe 'add_windows_cert' do
@@ -32,6 +42,15 @@ describe 'beaker::ca_cert_helper' do
     }
   end
 
+  describe 'add_solaris_cert' do
+    it {
+      host = {"platform" => 'solaris-11-x86_64', 'distmoduledir' => '/dne', 'hieraconf' => '/dne'}
+      expect(subject).to receive(:on).with(host, 'echo \'# geotrustglobal.pem\' >> /opt/puppet/ssl/cert.pem')
+      expect(subject).to receive(:on).with(host, 'cat geotrustglobal.pem >> /opt/puppet/ssl/cert.pem')
+      subject.add_solaris_cert host, 'geotrustglobal.pem'
+    }
+  end
+
   describe 'get_cert_hash' do
     it 'should contain 3 certs' do
       cert_hash = subject.get_cert_hash

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-puppet_install_helper
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-21 00:00:00.000000000 Z
+date: 2015-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -77,7 +77,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.2.3
 signing_key: 
 specification_version: 4
 summary: Puppet install helper for Beaker