Merge pull request #290 from xaque208/solarisupdate

Update Solaris support for newer Facter
puppetlabs · Aug 5, 2015 · 7c9e36f · 7c9e36f
2 parents fe97d51 + 4b53db9
commit 7c9e36f
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/manifests/params.pp b/manifests/params.pp
@@ -229,7 +229,7 @@
       $config        = '/etc/inet/ntp.conf'
       $driftfile     = '/var/ntp/ntp.drift'
       $keys_file     = '/etc/inet/ntp.keys'
-      if $::operatingsystemrelease =~ /^(5\.10|10|10_u\d+)$/
+      if $::kernelrelease == '5.10'
       {
         # Solaris 10
         $package_name = [ 'SUNWntpr', 'SUNWntpu' ]

diff --git a/spec/acceptance/ntp_install_spec.rb b/spec/acceptance/ntp_install_spec.rb
@@ -15,7 +15,7 @@
 when 'AIX'
   packagename = 'bos.net.tcp.client'
 when 'Solaris'
-  case fact('operatingsystemrelease')
+  case fact('kernelrelease')
   when '5.10'
     packagename = ['SUNWntpr','SUNWntpu']
   when '5.11'

diff --git a/spec/acceptance/ntp_parameters_spec.rb b/spec/acceptance/ntp_parameters_spec.rb
@@ -15,7 +15,7 @@
 when 'AIX'
   packagename = 'bos.net.tcp.client'
 when 'Solaris'
-  case fact('operatingsystemrelease')
+  case fact('kernelrelease')
   when '5.10'
     packagename = ['SUNWntpr','SUNWntpu']
   when '5.11'

diff --git a/spec/classes/ntp_spec.rb b/spec/classes/ntp_spec.rb
@@ -637,9 +637,9 @@
         end
       end
 
-      describe "on osfamily Solaris and operatingsystemrelease 5.10" do
+      describe "on osfamily Solaris and kernelrelease 5.10" do
         let :facts do
-          super().merge({ :osfamily => 'Solaris', :operatingsystemrelease => '5.10' })
+          super().merge({ :osfamily => 'Solaris', :kernelrelease => '5.10' })
         end
 
         it 'uses the NTP pool servers by default' do
@@ -649,9 +649,9 @@
         end
       end
 
-      describe "on osfamily Solaris and operatingsystemrelease 5.11" do
+      describe "on osfamily Solaris and kernelrelease 5.11" do
         let :facts do
-          super().merge({ :osfamily => 'Solaris', :operatingsystemrelease => '5.11' })
+          super().merge({ :osfamily => 'Solaris', :kernelrelease => '5.11' })
         end
 
         it 'uses the NTP pool servers by default' do