beaker-puppet_install_helper 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1634202fd5a2d74c1a6c865c1b2e0d15be6a94c
-  data.tar.gz: a312db3863c03ce13989e52f1c592461ff2ece88
+  metadata.gz: 8238bf66282860a17d554708397faf4d2e6a0adb
+  data.tar.gz: fb006b5ca3e07a31fed44ddaba759fbb7c0f46c5
 SHA512:
-  metadata.gz: f8b9749673452f4a24300967786253557df3f439f0f0294d010bc41583c0251b7aae357206ba0ce61fd33d2b6faf5f35be1bd36ec43c2f9f12130bb25de487a3
-  data.tar.gz: 81abf1eb8574e583c7427799d0874235a28ba0a11ee447bd2ca9cde791d29e403b3ec89418f6f4e796bcc2078f8b8e5987591c0f6a165b933e400064766aac84
+  metadata.gz: 9914f24a37f7d8e58f62f47d9759a893dd791a81e69d5e41bd4fd1e9932673eaa2f2cc18cd0d99113c19d40a0a7fb612ee0dbaa91b96127dc226bf8942774b1d
+  data.tar.gz: c3bb58813e192fd100ea2fabc651f7c480fae854316b8cd171d8b4a0870b141041677c2a21a256e5bc246f0f8c58b36f6846f5b204b6ff50dfaebbff808a7932

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.1'
+  s.version     = '0.4.2'
   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

@@ -1,7 +1,10 @@
 require 'beaker'
-require 'beaker/dsl/helpers/host_helpers'
+require 'beaker/dsl/patterns'
+require 'beaker/dsl/helpers'
 
 module Beaker::CaCertHelper
+  include Beaker::DSL::Helpers
+  include Beaker::DSL::Patterns
 
   def install_ca_certs
     install_ca_certs_on(hosts)
@@ -17,12 +20,12 @@ module Beaker::CaCertHelper
   def install_ca_certs_on(hosts)
     [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
+          create_cert_on_host(host, cert_name, ca)
           add_windows_cert host, cert_name
-        # No longer needed, apparently.
-        #elsif host['platform'] =~ /solaris/i
-        #  add_solaris_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

data/lib/beaker/puppet_install_helper.rb

@@ -46,6 +46,9 @@ module Beaker::PuppetInstallHelper
     when "pe"
       # This 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
     when "foss"
       opts = options.merge({
         :version        => version,

data/spec/unit/beaker/ca_cert_helper_spec.rb

@@ -2,7 +2,10 @@ require 'spec_helper'
 
 describe 'beaker::ca_cert_helper' do
   let :subject do
-    Class.new { include Beaker::CaCertHelper }
+    Class.new do
+      include Beaker::PuppetInstallHelper
+      include Beaker::CaCertHelper
+    end
   end
 
 
@@ -23,15 +26,15 @@ describe 'beaker::ca_cert_helper' do
       subject.install_ca_certs_on w2k3
     end
 
-    #it "solaris 11 node" do
-    #  sol = {"platform" => 'solaris-11-x86_64', 'distmoduledir' => '/dne', 'hieraconf' => '/dne'}
+    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
+      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
@@ -42,14 +45,14 @@ 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 '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

data/spec/unit/beaker/puppet_install_helper_spec.rb

@@ -97,6 +97,16 @@ describe 'beaker::puppet_install_helper' do
         expect(subject).to receive(:install_pe_on).with(hosts,{"pe_ver" => "3.8.1"})
         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'}
+        hosts = [ sol ]
+        ENV["PUPPET_INSTALL_TYPE"] = "pe"
+        ENV["PUPPET_INSTALL_VERSION"] = "3.8.1"
+        expect(subject).to receive(:install_pe_on).with(hosts,{"pe_ver" => "3.8.1"})
+        expect(subject).to receive(:create_cert_on_host).exactly(3).times
+        expect(subject).to receive(:add_solaris_cert).exactly(3).times
+        subject.run_puppet_install_helper_on(hosts)
+      end
     end
     context "for puppet-agent" do
       it "uses agent explicitly" do

metadata

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