Merge pull request #272 from jhoblitt/feature/fedora-support

fedora support
puppetlabs · Jun 24, 2015 · 8e763ef · 8e763ef
2 parents 9067bb6 + 7291d1a
commit 8e763ef
Show file tree

Hide file tree

Showing 6 changed files with 79 additions and 25 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.
+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.
 
 ##Development
 

diff --git a/manifests/params.pp b/manifests/params.pp
@@ -2,7 +2,6 @@
 
   $autoupdate        = false
   $config_template   = 'ntp/ntp.conf.erb'
-  $disable_monitor   = false
   $keys_enable       = false
   $keys_controlkey   = ''
   $keys_requestkey   = ''
@@ -48,23 +47,24 @@
 
   case $::osfamily {
     'AIX': {
-      $config        = $default_config
-      $keys_file     = '/etc/ntp.keys'
-      $driftfile     = '/etc/ntp.drift'
-      $package_name  = [ 'bos.net.tcp.client' ]
-      $restrict      = [
+      $config          = $default_config
+      $keys_file       = '/etc/ntp.keys'
+      $driftfile       = '/etc/ntp.drift'
+      $package_name    = [ 'bos.net.tcp.client' ]
+      $restrict        = [
         'default nomodify notrap nopeer noquery',
         '127.0.0.1',
       ]
-      $service_name  = 'xntpd'
-      $iburst_enable = true
-      $servers       = [
+      $service_name    = 'xntpd'
+      $iburst_enable   = true
+      $servers         = [
         '0.debian.pool.ntp.org',
         '1.debian.pool.ntp.org',
         '2.debian.pool.ntp.org',
         '3.debian.pool.ntp.org',
       ]
-      $maxpoll       = undef
+      $maxpoll         = undef
+      $disable_monitor = false
     }
     'Debian': {
       $config          = $default_config
@@ -86,26 +86,48 @@
         '3.debian.pool.ntp.org',
       ]
       $maxpoll         = undef
+      $disable_monitor = false
     }
     'RedHat': {
       $config          = $default_config
       $keys_file       = $default_keys_file
       $driftfile       = $default_driftfile
       $package_name    = $default_package_name
       $service_name    = $default_service_name
-      $restrict        = [
-        'default kod nomodify notrap nopeer noquery',
-        '-6 default kod nomodify notrap nopeer noquery',
-        '127.0.0.1',
-        '-6 ::1',
-      ]
-      $iburst_enable   = false
-      $servers         = [
-        '0.centos.pool.ntp.org',
-        '1.centos.pool.ntp.org',
-        '2.centos.pool.ntp.org',
-      ]
       $maxpoll         = undef
+
+      case $::operatingsystem {
+        'Fedora': {
+          $restrict        = [
+            'default nomodify notrap nopeer noquery',
+            '127.0.0.1',
+            '::1',
+          ]
+          $iburst_enable   = true
+          $servers         = [
+            '0.fedora.pool.ntp.org',
+            '1.fedora.pool.ntp.org',
+            '2.fedora.pool.ntp.org',
+            '3.fedora.pool.ntp.org',
+          ]
+          $disable_monitor = true
+        }
+        default: {
+          $restrict        = [
+            'default kod nomodify notrap nopeer noquery',
+            '-6 default kod nomodify notrap nopeer noquery',
+            '127.0.0.1',
+            '-6 ::1',
+          ]
+          $iburst_enable   = false
+          $servers         = [
+            '0.centos.pool.ntp.org',
+            '1.centos.pool.ntp.org',
+            '2.centos.pool.ntp.org',
+          ]
+          $disable_monitor = false
+        }
+      }
     }
     'Suse': {
       if $::operatingsystem == 'SLES' and $::operatingsystemmajrelease == '12'
@@ -133,6 +155,7 @@
         '3.opensuse.pool.ntp.org',
       ]
       $maxpoll         = undef
+      $disable_monitor = false
     }
     'FreeBSD': {
       $config          = $default_config
@@ -154,6 +177,7 @@
         '3.freebsd.pool.ntp.org',
       ]
       $maxpoll         = 9
+      $disable_monitor = false
     }
     'Archlinux': {
       $config          = $default_config
@@ -175,6 +199,7 @@
         '3.arch.pool.ntp.org',
       ]
       $maxpoll         = undef
+      $disable_monitor = false
     }
     'Solaris': {
       $config        = '/etc/inet/ntp.conf'
@@ -207,6 +232,7 @@
         '3.pool.ntp.org',
       ]
       $maxpoll       = undef
+      $disable_monitor = false
     }
   # Gentoo was added as its own $::osfamily in Facter 1.7.0
     'Gentoo': {
@@ -229,6 +255,7 @@
         '3.gentoo.pool.ntp.org',
       ]
       $maxpoll         = undef
+      $disable_monitor = false
     }
     'Linux': {
     # Account for distributions that don't have $::osfamily specific settings.
@@ -254,6 +281,7 @@
             '3.gentoo.pool.ntp.org',
           ]
           $maxpoll         = undef
+          $disable_monitor = false
         }
         default: {
           fail("The ${module_name} module is not supported on an ${::operatingsystem} distribution.")

diff --git a/metadata.json b/metadata.json
@@ -40,6 +40,14 @@
         "7"
       ]
     },
+    {
+      "operatingsystem": "Fedora",
+      "operatingsystemrelease": [
+        "20",
+        "21",
+        "22"
+      ]
+    },
     {
       "operatingsystem": "SLES",
       "operatingsystemrelease": [

diff --git a/spec/acceptance/nodesets/fedora-21-x64.yml b/spec/acceptance/nodesets/fedora-21-x64.yml
@@ -0,0 +1,9 @@
+HOSTS:
+  fedora-21:
+    roles:
+      - master
+    platform: fedora-21-x86_64
+    box: chef/fedora-21
+    hypervisor: vagrant
+CONFIG:
+  type: foss
diff --git a/spec/acceptance/ntp_config_spec.rb b/spec/acceptance/ntp_config_spec.rb
@@ -6,7 +6,12 @@
 when 'Debian'
   line = '0.debian.pool.ntp.org iburst'
 when 'RedHat'
-  line = '0.centos.pool.ntp.org'
+  case fact('operatingsystem')
+  when 'Fedora'
+    line = '0.fedora.pool.ntp.org'
+  else
+    line = '0.centos.pool.ntp.org'
+  end
 when 'Suse'
   line = '0.opensuse.pool.ntp.org'
 when 'Gentoo'

diff --git a/spec/classes/ntp_spec.rb b/spec/classes/ntp_spec.rb
@@ -3,7 +3,7 @@
 describe 'ntp' do
   let(:facts) {{ :is_virtual => 'false' }}
 
-  ['Debian', 'RedHat','Suse', 'FreeBSD', 'Archlinux', 'Gentoo', 'Gentoo (Facter < 1.7)'].each do |system|
+  ['Debian', 'RedHat', 'Fedora', 'Suse', 'FreeBSD', 'Archlinux', 'Gentoo', 'Gentoo (Facter < 1.7)'].each do |system|
     context "when on system #{system}" do
       if system == 'Gentoo (Facter < 1.7)'
         let :facts do
@@ -13,6 +13,10 @@
         let :facts do
           super().merge({ :osfamily => system,:operatingsystem => 'SLES',:operatingsystemmajrelease => '11' })
         end
+      elsif system == 'Fedora'
+        let :facts do
+          super().merge({ :osfamily => 'RedHat', :operatingsystem => system ,:operatingsystemmajrelease => '22' })
+        end
       else
         let :facts do
           super().merge({ :osfamily => system })