Revert "- add Solaris 12 support"

This reverts commit 158f33f.
puppetlabs · Jul 21, 2015 · 26e6b7f · 26e6b7f
1 parent d58e30b
commit 26e6b7f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 21 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 10 and 12 and Fedora 20-22.
+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 Fedora 20-22.
 
 ##Development
 

diff --git a/manifests/params.pp b/manifests/params.pp
@@ -222,23 +222,9 @@
       $config        = '/etc/inet/ntp.conf'
       $driftfile     = '/var/ntp/ntp.drift'
       $keys_file     = '/etc/inet/ntp.keys'
-      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',
-        ]
+      $package_name  = $::operatingsystemrelease ? {
+        /^(5\.10|10|10_u\d+)$/ => [ 'SUNWntpr', 'SUNWntpu' ],
+        /^(5\.11|11|11\.\d+)$/ => [ 'service/network/ntp' ]
       }
       $service_name  = 'network/ntp'
       $iburst_enable = false

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