Merge pull request redhat-openstack#277 from pixelpark/solaris10_support

Add Solaris 10 Support
xbezdick · Jun 23, 2015 · 9067bb6 · 9067bb6
2 parents 45e234d + d2bfdc0
commit 9067bb6
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 11 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. Additionally, it is tested (but not supported) on Solaris 12.
+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 10 and 12.
 
 ##Development
 

diff --git a/manifests/params.pp b/manifests/params.pp
@@ -180,17 +180,24 @@
       $config        = '/etc/inet/ntp.conf'
       $driftfile     = '/var/ntp/ntp.drift'
       $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\.12|12|12\.\d+)$/ => [ 'service/network/ntp' ]
+      if $::operatingsystemrelease =~ /^(5\.10|10|10_u\d+)$/
+      {
+        # Solaris 10
+        $package_name = [ 'SUNWntpr', 'SUNWntpu' ]
+        $restrict     = [
+          'default nomodify notrap nopeer noquery',
+          '127.0.0.1',
+        ]
+      } else {
+        # Solaris 11, 12 ...
+        $package_name = [ 'service/network/ntp' ]
+        $restrict     = [
+          'default kod nomodify notrap nopeer noquery',
+          '-6 default kod nomodify notrap nopeer noquery',
+          '127.0.0.1',
+          '-6 ::1',
+        ]
       }
-      $restrict      = [
-        'default kod nomodify notrap nopeer noquery',
-        '-6 default kod nomodify notrap nopeer noquery',
-        '127.0.0.1',
-        '-6 ::1',
-      ]
       $service_name  = 'network/ntp'
       $iburst_enable = false
       $servers       = [

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