.gitignore

@@ -1,3 +1,9 @@
 pkg
 .rspec_system/
 Gemfile.lock
+vendor
+spec/fixtures
+.rspec_system
+.bundle
+.vagrant
+.*sw*

CHANGELOG.md

@@ -1,3 +1,17 @@
+##2014-06-04 - Release 1.2.4
+###Summary
+
+This is a compatibility release. No functional changes to this module were made
+in this release, just testing infrastructure changes to extend tests to RHEL7
+and Ubuntu 14.04
+
+####Features
+
+####Bugfixes
+
+####Known Bugs
+* No known bugs
+
 ##2014-03-04 - Supported Release 1.2.3
 ###Summary
 

Modulefile

@@ -1,5 +1,5 @@
 name 'puppetlabs-java_ks'
-version '1.2.3'
+version '1.2.4'
 
 author 'puppetlabs'
 license 'ASL 2.0'

metadata.json

@@ -1,6 +1,6 @@
 {
     "name": "puppetlabs-java_ks",
-    "version": "1.2.3",
+    "version": "1.2.4",
     "source": "https://github.com/puppetlabs/puppetlabs-java_ks",
     "author": "Puppet Labs",
     "license": "Apache-2.0",
@@ -11,28 +11,32 @@
         "operatingsystem": "RedHat",
         "operatingsystemrelease": [
           "5",
-          "6"
+          "6",
+          "7"
         ]
       },
       {
         "operatingsystem": "CentOS",
         "operatingsystemrelease": [
           "5",
-          "6"
+          "6",
+          "7"
         ]
       },
       {
         "operatingsystem": "OracleLinux",
         "operatingsystemrelease": [
           "5",
-          "6"
+          "6",
+          "7"
         ]
       },
       {
         "operatingsystem": "Scientific",
         "operatingsystemrelease": [
           "5",
-          "6"
+          "6",
+          "7"
         ]
       },
       {
@@ -52,7 +56,8 @@
         "operatingsystem": "Ubuntu",
         "operatingsystemrelease": [
           "10.04",
-          "12.04"
+          "12.04",
+          "14.04"
         ]
       },
       {
@@ -82,7 +87,7 @@
       }
     ],
     "requirements": [
-      { "name": "pe", "version_requirement": "3.2.x" },
+      { "name": "pe", "version_requirement": ">= 3.2.0 < 3.4.0" },
       { "name": "puppet", "version_requirement": "3.x" }
     ],
     "dependencies": []

spec/acceptance/keystore_spec.rb

@@ -15,7 +15,7 @@
     pp = <<-EOS
       java_ks { 'puppetca:keystore':
         ensure       => latest,
-        certificate  => '#{default['puppetpath']}/ssl/certs/ca.pem',
+        certificate  => "${settings::ssldir}/certs/ca.pem",
         target       => '/etc/keystore.ks',
         password     => 'puppet',
         trustcacerts => true,

spec/acceptance/nodesets/ubuntu-server-1404-x64.yml

@@ -0,0 +1,11 @@
+HOSTS:
+  ubuntu-server-1404-x64:
+    roles:
+      - master
+    platform: ubuntu-14.04-amd64
+    box : puppetlabs/ubuntu-14.04-64-nocm
+    box_url : https://vagrantcloud.com/puppetlabs/ubuntu-14.04-64-nocm
+    hypervisor : vagrant
+CONFIG:
+  log_level   : debug
+  type: git

spec/acceptance/private_key_spec.rb

@@ -19,8 +19,8 @@
     pp = <<-EOS
       java_ks { 'broker.example.com:/etc/private_key.ks':
         ensure       => latest,
-        certificate  => "#{confdir}/ssl/certs/#{hostname}.pem",
-        private_key  => "#{confdir}/ssl/private_keys/#{hostname}.pem",
+        certificate  => "${settings::ssldir}/certs/#{hostname}.pem",
+        private_key  => "${settings::ssldir}/private_keys/#{hostname}.pem",
         password     => 'puppet',
         path         => #{resource_path},
       }
@@ -42,22 +42,22 @@
     it 'puts a key in a module' do
       pp = <<-EOS
         file { [
-          '#{modulepath}/keys',
-          '#{modulepath}/keys/files',
+          "#{modulepath}/keys",
+          "#{modulepath}/keys/files",
         ]:
           ensure => directory,
         }
-        file { '#{modulepath}/keys/files/ca.pem':
+        file { "#{modulepath}/keys/files/ca.pem":
           ensure => file,
-          source => '#{confdir}/ssl/certs/ca.pem',
+          source => "${settings::ssldir}/certs/ca.pem",
         }
-        file { '#{modulepath}/keys/files/certificate.pem':
+        file { "#{modulepath}/keys/files/certificate.pem":
           ensure => file,
-          source => '#{confdir}/ssl/certs/#{hostname}.pem',
+          source => "${settings::ssldir}/certs/#{hostname}.pem",
         }
-        file { '#{modulepath}/keys/files/private_key.pem':
+        file { "#{modulepath}/keys/files/private_key.pem":
           ensure => file,
-          source => '#{confdir}/ssl/private_keys/#{hostname}.pem',
+          source => "${settings::ssldir}/private_keys/#{hostname}.pem",
         }
       EOS
 

spec/acceptance/truststore_spec.rb

@@ -15,7 +15,7 @@
     pp = <<-EOS
       java_ks { 'puppetca:truststore':
         ensure       => latest,
-        certificate  => '#{default['puppetpath']}/ssl/certs/ca.pem',
+        certificate  => "${settings::ssldir}/certs/ca.pem",
         target       => '/etc/truststore.ts',
         password     => 'puppet',
         trustcacerts => true,

spec/acceptance/unsupported_spec.rb

@@ -15,7 +15,7 @@
     pp = <<-EOS
     java_ks { 'puppetca:keystore':
       ensure       => latest,
-      certificate  => '#{default['puppetpath']}/ssl/certs/ca.pem',
+      certificate  => "${settings::ssldir}/certs/ca.pem",
       target       => '/etc/keystore.ks',
       password     => 'puppet',
       trustcacerts => true,

spec/spec_helper_acceptance.rb

@@ -3,22 +3,15 @@
 
 UNSUPPORTED_PLATFORMS = []
 
-unless ENV['RS_PROVISION'] == 'no'
+unless ENV['RS_PROVISION'] == 'no' or ENV['BEAKER_provision'] == 'no'
+  if hosts.first.is_pe?
+    install_pe
+  else
+    install_puppet
+  end
   hosts.each do |host|
-    if host['platform'] =~ /debian/
-      on host, 'echo \'export PATH=/var/lib/gems/1.8/bin/:${PATH}\' >> ~/.bashrc'
-    end
-    if host.is_pe?
-      install_pe
-    else
-      # Install Puppet
-      install_package host, 'rubygems'
-      on host, 'gem install puppet --no-ri --no-rdoc'
-      on host, "mkdir -p #{host['distmoduledir']}"
-      # Create certs for keystore tests.
-      on host, 'puppet master --no-daemonize --verbose &'
-      #on host, 'killall -9 puppet'
-    end
+    on host, 'puppet master'
+    on hosts, "mkdir -p #{host['distmoduledir']}"
   end
 end
 
@@ -34,7 +27,7 @@
     # Install module and dependencies
     puppet_module_install(:source => proj_root, :module_name => 'java_ks')
     hosts.each do |host|
-      on host, puppet('module','install','puppetlabs-java')
+      shell('puppet module install puppetlabs-java')
     end
   end
 end