Merge pull request redhat-openstack#225 from mhaskel/test

merge 3.3.x into master
strider · Nov 5, 2014 · 1e98668 · 1e98668
2 parents 4fd5093 + 948d053
commit 1e98668
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
+##2014-11-04 - Supported Release 3.3.0
+###Summary
+
+This release adds support for SLES 12.
+
+####Features
+- Added support for SLES 12
+
 ##2014-10-02 - Supported Release 3.2.1
 ###Summary
 

diff --git a/README.markdown b/README.markdown
@@ -218,19 +218,19 @@ status as a virtual machine.
 
 ##Limitations
 
-This module has been built on and tested against Puppet 2.7 and higher.
+This module has been built on and tested against Puppet 3.
 
 The module has been tested on:
 
-* RedHat Enterprise Linux 5/6
+* RedHat Enterprise Linux 5/6/7
+* CentOS 5/6/7
+* Oracle Enterprise Linux 5/6/7
+* Scientific Linux 5/6/7
+* SLES 10SP4/11SP1/12
 * Debian 6/7
-* CentOS 5/6
-* Ubuntu 12.04
-* Gentoo
-* Arch Linux
-* FreeBSD
+* Ubuntu 10.04/12.04/14.04
 * Solaris 11
-* AIX 5.3, 6.1, 7.1
+* AIX 5.3/6.1/7.1
 
 Testing on other platforms has been light and cannot be guaranteed. 
 

diff --git a/metadata.json b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-ntp",
-  "version": "3.2.1",
+  "version": "3.3.0",
   "author": "Puppet Labs",
   "summary": "NTP Module",
   "license": "Apache Version 2.0",
@@ -43,7 +43,9 @@
     {
       "operatingsystem": "SLES",
       "operatingsystemrelease": [
-        "11 SP1"
+        "10 SP4",
+        "11 SP1",
+        "12"
       ]
     },
     {

diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
@@ -18,11 +18,11 @@
       on host, "/bin/echo '' > #{host['hieraconf']}"
     end
     on host, "mkdir -p #{host['distmoduledir']}"
-    if host['platform'] =~ /sles-12/
+    if host['platform'] =~ /sles-12/i || host['platform'] =~ /solaris-11/i
       apply_manifest_on(host, 'package{"git":}')
       on host, 'git clone -b 4.3.x https://github.com/puppetlabs/puppetlabs-stdlib /etc/puppetlabs/puppet/modules/stdlib'
     else
-      on host, puppet_module_install('puppetlabs/stdlib')
+      on host, puppet('module install puppetlabs-stdlib'), {:acceptable_exit_codes => [0, 1]}
     end
   end
 end
@@ -38,7 +38,6 @@
   c.before :suite do
     hosts.each do |host|
       on host, "mkdir -p #{host['distmoduledir']}/ntp"
-      on host, puppet('module install puppetlabs-stdlib')
       %w(lib manifests templates metadata.json).each do |file|
         scp_to host, "#{proj_root}/#{file}", "#{host['distmoduledir']}/ntp"
       end