Work for SLES 12 compatibility

Author: Helen Campbell

README.markdown

@@ -302,6 +302,10 @@ Tells Puppet whether to manage the NTP service. Valid options: 'true' or 'false'
 
 Tells Puppet what NTP service to manage. Valid options: string. Default value: varies by operating system
 
+####`service_provider`
+
+Tells Puppet which service provider to use for NTP. Valid options: string. Default value: 'undef'
+
 ####`stepout`
 
 Tells puppet to change stepout. Applies only if `tinker` value is 'true'. Valid options: unsigned shortint digit. Default value: undef.

manifests/config.pp

@@ -1,6 +1,13 @@
 # Private Class
 class ntp::config inherits ntp {
 
+  #The servers-netconfig file overrides NTP config on SLES 12, interfering with our configuration.
+  if $::operatingsystem == 'SLES' and $::operatingsystemmajrelease == '12' {
+    file { '/var/run/ntp/servers-netconfig':
+      ensure => 'absent'
+    }
+  }
+
   if $ntp::keys_enable {
     case $ntp::config_dir {
       '/', '/etc', undef: {}

manifests/init.pp

@@ -34,6 +34,7 @@
   $service_ensure    = $ntp::params::service_ensure,
   $service_manage    = $ntp::params::service_manage,
   $service_name      = $ntp::params::service_name,
+  $service_provider  = $ntp::params::service_provider,
   $stepout           = $ntp::params::stepout,
   $tinker            = $ntp::params::tinker,
   $tos               = $ntp::params::tos,

manifests/params.pp

@@ -77,6 +77,7 @@
         '3.debian.pool.ntp.org',
       ]
       $maxpoll         = undef
+      $service_provider= undef
     }
     'Debian': {
       $config          = $default_config
@@ -98,6 +99,7 @@
         '3.debian.pool.ntp.org',
       ]
       $maxpoll         = undef
+      $service_provider= undef
     }
     'RedHat': {
       $config          = $default_config
@@ -106,6 +108,7 @@
       $package_name    = $default_package_name
       $service_name    = $default_service_name
       $maxpoll         = undef
+      $service_provider= undef
 
       case $::operatingsystem {
         'Fedora': {
@@ -156,6 +159,8 @@
               $service_name  = 'ntpd'
               $keys_file     = '/etc/ntp.keys'
               $package_name  = $default_package_name
+              #Puppet 3 does not recognise systemd as service provider on SLES 12.
+              $service_provider = 'systemd'
             }
             default: {
               fail("The ${module_name} module is not supported on an ${::operatingsystem} ${::operatingsystemmajrelease} distribution.")
@@ -198,6 +203,7 @@
         '3.opensuse.pool.ntp.org',
       ]
       $maxpoll         = undef
+      $service_provider= undef
     }
     'FreeBSD': {
       $config          = $default_config
@@ -219,6 +225,7 @@
         '3.freebsd.pool.ntp.org',
       ]
       $maxpoll         = 9
+      $service_provider= undef
     }
     'Archlinux': {
       $config          = $default_config
@@ -240,6 +247,7 @@
         '3.arch.pool.ntp.org',
       ]
       $maxpoll         = undef
+      $service_provider= undef
     }
     'Solaris': {
       $config        = '/etc/inet/ntp.conf'
@@ -272,6 +280,7 @@
         '3.pool.ntp.org',
       ]
       $maxpoll       = undef
+      $service_provider= undef
     }
   # Gentoo was added as its own $::osfamily in Facter 1.7.0
     'Gentoo': {
@@ -294,6 +303,7 @@
         '3.gentoo.pool.ntp.org',
       ]
       $maxpoll         = undef
+      $service_provider= undef
     }
     'Linux': {
     # Account for distributions that don't have $::osfamily specific settings.
@@ -319,6 +329,7 @@
             '3.gentoo.pool.ntp.org',
           ]
           $maxpoll         = undef
+          $service_provider= undef
         }
         'Amazon': {
           $config          = $default_config
@@ -339,6 +350,7 @@
             '2.centos.pool.ntp.org',
           ]
           $maxpoll         = undef
+          $service_provider= undef
           $disable_monitor = false
         }
         default: {

manifests/service.pp

@@ -10,6 +10,7 @@
       ensure     => $ntp::service_ensure,
       enable     => $ntp::service_enable,
       name       => $ntp::service_name,
+      provider   => $ntp::service_provider,
       hasstatus  => true,
       hasrestart => true,
     }