simp-beaker-helpers 1.7.2 → 1.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4dc5e97b43efe34e806ff667363f93d9b550bb3
-  data.tar.gz: b37a65641c5255ba76ef3aae657fcf1da2c9130a
+  metadata.gz: c7de1dfcac5f44c9466b55ae675bfe3191ecf512
+  data.tar.gz: fd4d1615265b83861e702fad89e3250051444e85
 SHA512:
-  metadata.gz: 3100502341f3d597b2bd2cd5f35d4dfeb6157592426c3d089006428bd72b93e14556097bb03709de7ce613faadc2c4ee9735fb342cc98313a07e3b1335b355e2
-  data.tar.gz: 1d140d0f353bf0373d8bfbfeb7baf8799b636ce62b4aa4abfa3b9db2d38547ef3a3b66b87575de502d85af482e75eff0f8920c9b5faf43fa11f4167c7a3e6a2b
+  metadata.gz: e22ef74e3d2fdaa17a893441fa8efd24d26c7e5b00e402c7d2905d2cd2a69e6c555d94d76bb1e3423228b672ff2c0244e33215646d796299f4f464e1fa6a2460
+  data.tar.gz: 249acf36822fe694fd6468c03136ea221448c06b3739cb4ae7d189ee6bfbdabdeb18d4f63dc2f33d64b5231b64a8d3ffbc0f98e636f05ab83caa5587928b5656

data/Gemfile

@@ -1,9 +1,8 @@
-# Variables:
-#
-# SIMP_GEM_SERVERS | a space/comma delimited list of rubygem servers
-# PUPPET_VERSION   | specifies the version of the puppet gem to load
-puppetversion = ENV.key?('PUPPET_VERSION') ? "#{ENV['PUPPET_VERSION']}" : ['~>3']
-gem_sources   = ENV.key?('SIMP_GEM_SERVERS') ? ENV['SIMP_GEM_SERVERS'].split(/[, ]+/) : ['https://rubygems.org']
+# ------------------------------------------------------------------------------
+# NOTE: SIMP Puppet rake tasks support ruby 2.1.9
+# ------------------------------------------------------------------------------
+gem_sources = ENV.fetch('GEM_SERVERS','https://rubygems.org').split(/[, ]+/)
+
 gem_sources.each { |gem_source| source gem_source }
 
 # read dependencies in from the gemspec
@@ -19,5 +18,5 @@ group :system_tests do
   gem 'beaker-rspec'
   gem 'net-ssh'
   gem 'puppetlabs_spec_helper'
-  gem 'puppet', puppetversion
+  gem 'puppet', ENV.fetch('PUPPET_VERSION', '~> 4.0')
 end

data/lib/simp/beaker_helpers.rb

@@ -173,6 +173,13 @@ module Simp::BeakerHelpers
         # (last checked: 20150928)
           package { ['kernel'] : ensure => 'latest' }
 
+          package { ['dracut-fips'] : ensure => 'latest' }
+          ~>
+          exec { 'Always run dracut after installing dracut-fips':
+            command => '/usr/bin/dracut -f',
+            refreshonly => true
+          }
+
           package { ['grubby'] : ensure => 'latest' }
           ~>
           exec{ 'setup_fips':

data/lib/simp/beaker_helpers/version.rb

@@ -1,5 +1,5 @@
 module Simp; end
 
 module Simp::BeakerHelpers
-  VERSION = '1.7.2'
+  VERSION = '1.7.3'
 end

data/spec/acceptance/enable_fips_spec.rb

@@ -0,0 +1,16 @@
+require 'spec_helper_acceptance'
+
+hosts.each do |host|
+  describe 'ensure FIPS mode matches ENV[BEAKER_fips]' do
+    context "on #{host}" do
+     it 'check /proc/sys/crypto/fips_enabled' do
+        stdout = on(host, 'cat /proc/sys/crypto/fips_enabled').stdout.strip
+        if ENV['BEAKER_fips'] == 'yes'
+          expect(stdout).to eq("1")
+        else
+          expect(stdout).to eq("0")
+        end
+      end 
+    end
+  end
+end

data/spec/acceptance/fixture_modules_spec.rb

@@ -13,13 +13,6 @@ context 'after copy_fixture_modules_to( hosts )' do
     end
   end
 
-  describe "fact_on(master,'root_home', {:puppet => nil})" do
-    it 'should return value of `root_home`' do
-      puts fact = fact_on(master, 'root_home', {:puppet => nil} )
-      expect( fact ).to eq '/root'
-    end
-  end
-
   describe "pfact_on(master,'root_home')" do
     it 'should return value of `root_home`' do
       puts fact = pfact_on(master, 'root_home')

data/spec/acceptance/nodesets/default.yml

@@ -1,23 +1,22 @@
 HOSTS:
-  server:
+  server-el7:
     roles:
       - server
       - default
       - master
+      - el7
     platform:   el-7-x86_64
-    box:        puppetlabs/centos-7.0-64-nocm
-    box_url:    https://vagrantcloud.com/puppetlabs/boxes/centos-7.0-64-nocm
+    box:        centos/7
     hypervisor: vagrant
-##  client:
-##    roles:
-##      - client
-##      - agent
-##    platform:   el-7-x86_64
-##    box:        puppetlabs/centos-7.0-64-nocm
-##    box_url:    https://vagrantcloud.com/puppetlabs/boxes/centos-7.0-64-nocm
-##    hypervisor: vagrant
+
+  server-el6:
+    roles:
+      - el6
+    platform:   el-6-x86_64
+    box:        centos/6
+    hypervisor: vagrant
+
 CONFIG:
   log_level: verbose
-  type:      foss
+  type:      aio
   vagrant_memsize: 256
-  ## vb_gui: true

data/spec/acceptance/pki_tests_spec.rb

@@ -28,8 +28,8 @@ context 'PKI operations' do
     end
 
     describe 'a Fake CA under /root' do
-      @tmp_keydist_dir = Dir.mktmpdir 'simp-beaker-helpers__pki-tests'
-      run_fake_pki_ca_on( master, hosts, @tmp_keydist_dir  )
+      tmp_keydist_dir = Dir.mktmpdir 'simp-beaker-helpers__pki-tests'
+      run_fake_pki_ca_on( master, hosts, tmp_keydist_dir  )
 
       it 'should create /root/pki' do
         on(master, 'test -d /root/pki')
@@ -37,16 +37,10 @@ context 'PKI operations' do
 
       it_behaves_like 'a correctly copied keydist/ tree', '/root/pki/keydist'
 
-      ### TODO: fix scoping issues
-      ### it "copied keydist back to local directory '#{@tmp_keydist_dir}'" do
-      ###   require 'pry'; binding.pry
-      ###   expect( File.directory? @tmp_keydist_dir ).to be_truthy
-      ### end
     end
 
-
     describe 'after copy_keydist_to' do
-      test_dir = '/etc/puppet/modules/pki/files/keydist'
+      test_dir = '/etc/puppetlabs/code/environments/production/modules/pki/files/keydist'
       copy_keydist_to(master)
       it_behaves_like 'a correctly copied keydist/ tree', test_dir
     end
@@ -57,9 +51,5 @@ context 'PKI operations' do
       it_behaves_like 'a correctly copied keydist/ tree', test_dir
     end
 
-    after( :all ) do
-      FileUtils.remove_entry_secure( @tmp_keydist_dir )
-    end
   end
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-beaker-helpers
 version: !ruby/object:Gem::Version
-  version: 1.7.2
+  version: 1.7.3
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-30 00:00:00.000000000 Z
+date: 2017-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beaker
@@ -63,10 +63,8 @@ files:
 - lib/simp/beaker_helpers/version.rb
 - lib/simp/rake/beaker.rb
 - simp-beaker-helpers.gemspec
+- spec/acceptance/enable_fips_spec.rb
 - spec/acceptance/fixture_modules_spec.rb
-- spec/acceptance/nodesets/centos-66-x64.yml
-- spec/acceptance/nodesets/centos-7-x64.yml
-- spec/acceptance/nodesets/centos-combined-x64.yaml
 - spec/acceptance/nodesets/default.yml
 - spec/acceptance/pki_tests_spec.rb
 - spec/acceptance/set_hieradata_on_spec.rb
@@ -98,10 +96,8 @@ signing_key:
 specification_version: 4
 summary: beaker helper methods for SIMP
 test_files:
+- spec/acceptance/enable_fips_spec.rb
 - spec/acceptance/fixture_modules_spec.rb
-- spec/acceptance/nodesets/centos-66-x64.yml
-- spec/acceptance/nodesets/centos-7-x64.yml
-- spec/acceptance/nodesets/centos-combined-x64.yaml
 - spec/acceptance/nodesets/default.yml
 - spec/acceptance/pki_tests_spec.rb
 - spec/acceptance/set_hieradata_on_spec.rb

data/spec/acceptance/nodesets/centos-66-x64.yml

@@ -1,22 +0,0 @@
-HOSTS:
-  server:
-    roles:
-      - default
-      - master
-      - server
-    platform:   el-6-x86_64
-    box:        puppetlabs/centos-6.6-64-nocm
-    box_url:    https://vagrantcloud.com/puppetlabs/boxes/centos-6.6-64-nocm
-    hypervisor: vagrant
-  client:
-    roles:
-      - agent
-      - client
-    platform:   el-6-x86_64
-    box:        puppetlabs/centos-6.6-64-nocm
-    box_url:    https://vagrantcloud.com/puppetlabs/boxes/centos-6.6-64-nocm
-    hypervisor: vagrant
-CONFIG:
-  log_level: verbose
-  type:      foss
-  vagrant_memsize: 256

data/spec/acceptance/nodesets/centos-7-x64.yml

@@ -1,22 +0,0 @@
-HOSTS:
-  server:
-    roles:
-      - server
-      - default
-      - master
-    platform:   el-7-x86_64
-    box:        puppetlabs/centos-7.0-64-nocm
-    box_url:    https://vagrantcloud.com/puppetlabs/boxes/centos-7.0-64-nocm
-    hypervisor: vagrant
-  client:
-    roles:
-      - client
-      - agent
-    platform:   el-7-x86_64
-    box:        puppetlabs/centos-7.0-64-nocm
-    box_url:    https://vagrantcloud.com/puppetlabs/boxes/centos-7.0-64-nocm
-    hypervisor: vagrant
-CONFIG:
-  log_level: verbose
-  type:      foss
-  vagrant_memsize: 256

data/spec/acceptance/nodesets/centos-combined-x64.yaml

@@ -1,24 +0,0 @@
-# This nodeset spins up a simple one-host test VM for both EL6 and EL7
-HOSTS:
-  centos-7:
-    roles:
-      - server
-      - default
-      - master
-    platform:   el-7-x86_64
-    box:        puppetlabs/centos-7.0-64-nocm
-    box_url:    https://vagrantcloud.com/puppetlabs/boxes/centos-7.0-64-nocm
-    hypervisor: vagrant
-  centos-6:
-    roles:
-      - agent
-      - client
-    platform:   el-6-x86_64
-    box:        puppetlabs/centos-6.6-64-nocm
-    box_url:    https://vagrantcloud.com/puppetlabs/boxes/centos-6.6-64-nocm
-    hypervisor: vagrant
-CONFIG:
-  log_level: verbose
-  type:      foss
-  vagrant_memsize: 256
-  ## vb_gui: true