Merge pull request #431 from antaflos/remove_inherits

tphoney · web-flow · commit 0ba2e32b99eb · 2017-12-11T12:29:53.000Z
Don't use 'inherits' in config, install and service
diff --git a/manifests/config.pp b/manifests/config.pp
@@ -1,6 +1,6 @@
 # @api private
 # This class handles the configuration file. Avoid modifying private classes.
-class ntp::config inherits ntp {
+class ntp::config {
 
   #The servers-netconfig file overrides NTP config on SLES 12, interfering with our configuration.
   if ($facts['operatingsystem'] == 'SLES' and $facts['operatingsystemmajrelease'] == '12') or
diff --git a/manifests/install.pp b/manifests/install.pp
@@ -1,6 +1,6 @@
-# @api private 
+# @api private
 # This class handles ntp packages. Avoid modifying private classes.
-class ntp::install inherits ntp {
+class ntp::install {
 
   if $ntp::package_manage {
 
diff --git a/manifests/service.pp b/manifests/service.pp
@@ -1,6 +1,6 @@
 # @api private
 # This class handles the ntp service. Avoid modifying private classes.
-class ntp::service inherits ntp {
+class ntp::service {
 
   if $ntp::service_manage == true {
     service { 'ntp':
