Merge pull request redhat-openstack#274 from drewfisher314/ticket/213…

…7-add-solaris-12 - add Solaris 12 support
xbezdick · Jun 23, 2015 · 09d4db0 · 09d4db0
2 parents cb1af28 + 158f33f
commit 09d4db0
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/README.markdown b/README.markdown
@@ -291,7 +291,7 @@ Specifies the stratum the server should operate at when using the undisciplined
 
 ##Limitations
 
-This module has been tested on [all PE-supported platforms](https://forge.puppetlabs.com/supported#compat-matrix), and no issues have been identified.
+This module has been tested on [all PE-supported platforms](https://forge.puppetlabs.com/supported#compat-matrix), and no issues have been identified. Additionally, it is tested (but not supported) on Solaris 12.
 
 ##Development
 

diff --git a/manifests/params.pp b/manifests/params.pp
@@ -181,7 +181,8 @@
       $keys_file     = '/etc/inet/ntp.keys'
       $package_name  = $::operatingsystemrelease ? {
         /^(5\.10|10|10_u\d+)$/ => [ 'SUNWntpr', 'SUNWntpu' ],
-        /^(5\.11|11|11\.\d+)$/ => [ 'service/network/ntp' ]
+        /^(5\.11|11|11\.\d+)$/ => [ 'service/network/ntp' ],
+        /^(5\.12|12|12\.\d+)$/ => [ 'service/network/ntp' ]
       }
       $restrict      = [
         'default kod nomodify notrap nopeer noquery',

diff --git a/metadata.json b/metadata.json
@@ -66,7 +66,8 @@
     {
       "operatingsystem": "Solaris",
       "operatingsystemrelease": [
-        "11"
+        "11",
+        "12"
       ]
     },
     {
-Original file line number
+Diff line change
@@ Expand Up / @@ -66,7 +66,8 @@ @@
         {
           "operatingsystem": "Solaris",
           "operatingsystemrelease": [
-            "11"
+            "11",
+            "12"
           ]
         },
         {
@@ Expand Down @@