Merge 1.2.x

CHANGELOG.md

@@ -1,3 +1,8 @@
+##2014-11-11 - Supported Release 1.2.6
+###Summary
+
+This release has test fixes and files synced from modulesync.
+
 ##2014-07-10 - Supported Release 1.2.5
 ###Summary
 

metadata.json

@@ -1,84 +1,95 @@
 {
-    "name": "puppetlabs-java_ks",
-    "version": "1.2.5",
-    "source": "https://github.com/puppetlabs/puppetlabs-java_ks",
-    "author": "Puppet Labs",
-    "license": "Apache-2.0",
-    "project_page": "https://github.com/puppetlabs/puppetlabs-java_ks",
-    "summary": "Manage arbitrary Java keystore files",
-    "operatingsystem_support": [
-      {
-        "operatingsystem": "RedHat",
-        "operatingsystemrelease": [
-          "5",
-          "6",
-          "7"
-        ]
-      },
-      {
-        "operatingsystem": "CentOS",
-        "operatingsystemrelease": [
-          "5",
-          "6",
-          "7"
-        ]
-      },
-      {
-        "operatingsystem": "OracleLinux",
-        "operatingsystemrelease": [
-          "5",
-          "6",
-          "7"
-        ]
-      },
-      {
-        "operatingsystem": "Scientific",
-        "operatingsystemrelease": [
-          "5",
-          "6",
-          "7"
-        ]
-      },
-      {
-        "operatingsystem": "SLES",
-        "operatingsystemrelease": [
-          "10 SP4",
-          "11 SP1"
-        ]
-      },
-      {
-        "operatingsystem": "Debian",
-        "operatingsystemrelease": [
-          "6",
-          "7"
-        ]
-      },
-      {
-        "operatingsystem": "Ubuntu",
-        "operatingsystemrelease": [
-          "10.04",
-          "12.04",
-          "14.04"
-        ]
-      },
-      {
-        "operatingsystem": "Solaris",
-        "operatingsystemrelease": [
-          "10",
-          "11"
-        ]
-      },
-      {
-        "operatingsystem": "AIX",
-        "operatingsystemrelease": [
-          "6.1",
-          "7.1"
-        ]
-      }
-    ],
-    "requirements": [
-      { "name": "pe", "version_requirement": "3.x" },
-      { "name": "puppet", "version_requirement": "3.x" }
-    ],
-    "dependencies": []
+  "name": "puppetlabs-java_ks",
+  "version": "1.2.6",
+  "author": "puppetlabs",
+  "summary": "Manage arbitrary Java keystore files",
+  "license": "ASL 2.0",
+  "source": "https://github.com/puppetlabs/puppetlabs-java_ks.git",
+  "project_page": "https://github.com/puppetlabs/puppetlabs-java_ks",
+  "issues_url": "https://tickets.puppetlabs.com/browse/MODULES",
+  "operatingsystem_support": [
+    {
+      "operatingsystem": "RedHat",
+      "operatingsystemrelease": [
+        "5",
+        "6",
+        "7"
+      ]
+    },
+    {
+      "operatingsystem": "CentOS",
+      "operatingsystemrelease": [
+        "5",
+        "6",
+        "7"
+      ]
+    },
+    {
+      "operatingsystem": "OracleLinux",
+      "operatingsystemrelease": [
+        "5",
+        "6",
+        "7"
+      ]
+    },
+    {
+      "operatingsystem": "Scientific",
+      "operatingsystemrelease": [
+        "5",
+        "6",
+        "7"
+      ]
+    },
+    {
+      "operatingsystem": "SLES",
+      "operatingsystemrelease": [
+        "10 SP4",
+        "11 SP1",
+        "12"
+      ]
+    },
+    {
+      "operatingsystem": "Debian",
+      "operatingsystemrelease": [
+        "6",
+        "7"
+      ]
+    },
+    {
+      "operatingsystem": "Ubuntu",
+      "operatingsystemrelease": [
+        "10.04",
+        "12.04",
+        "14.04"
+      ]
+    },
+    {
+      "operatingsystem": "Solaris",
+      "operatingsystemrelease": [
+        "10",
+        "11"
+      ]
+    },
+    {
+      "operatingsystem": "AIX",
+      "operatingsystemrelease": [
+        "6.1",
+        "7.1"
+      ]
+    }
+  ],
+  "requirements": [
+    {
+      "name": "pe",
+      "version_requirement": "3.x"
+    },
+    {
+      "name": "puppet",
+      "version_requirement": "3.x"
+    }
+  ],
+  "description": "Uses a combination of keytool and openssl to manage entries in a Java keystore.",
+  "dependencies": [
+
+  ]
 }

spec/spec_helper_acceptance.rb

@@ -11,6 +11,11 @@
   if default.is_pe?; then install_pe; else install_puppet( foss_opts ); end
 
   hosts.each do |host|
+    if host["platform"] =~ /solaris/
+      on host, "echo 'export PATH=/opt/puppet/bin:/var/ruby/1.8/gem_home/bin:${PATH}' >> ~/.bashrc"
+    elsif host.is_pe?
+      on host, "echo 'export PATH=#{host['puppetbindir']}:${PATH}' >> ~/.bashrc"
+    end
     on host, "mkdir -p #{host['distmoduledir']}"
   end
 end
@@ -44,7 +49,13 @@
     # Install module and dependencies
     hosts.each do |host|
       copy_module_to(host, :source => proj_root, :module_name => 'java_ks')
-      on host, puppet('module', 'install', 'puppetlabs-java')
+      on host, puppet('module', 'install', 'puppetlabs-java'), { :acceptable_exit_codes => [0,1] }
+      # Generate private key and CA for keystore
+      if host.is_pe?
+        on host, "#{host['puppetbindir']}/ruby -e \"#{opensslscript}\""
+      else
+        on host, "ruby -e \"#{opensslscript}\""
+      end
     end
   end
 end