fix Bug #12656

voxpupuli · Sep 7, 2016 · 3a72551 · 3a72551
1 parent 010a854
commit 3a72551
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/manifests/config.pp b/manifests/config.pp
@@ -14,7 +14,7 @@
 #
 # Icinga Development Team <[email protected]>
 #
-class icinga2::config inherits icinga2::params {
+class icinga2::config {
 
   if $module_name != $caller_module_name {
     fail("icinga2::config is a private class of the module icinga2, you're not permitted to use it.")

diff --git a/manifests/install.pp b/manifests/install.pp
@@ -15,14 +15,16 @@
 #
 # Icinga Development Team <[email protected]>
 #
-class icinga2::install inherits icinga2::params {
+class icinga2::install {
 
   if $module_name != $caller_module_name {
     fail("icinga2::install is a private class of the module icinga2, you're not permitted to use it.")
   }
 
   if $::osfamily == 'windows' { Package { provider => chocolatey, } }
 
+  $package = $icinga2::params::package
+
   package { $package:
     ensure => installed,
   }

diff --git a/manifests/service.pp b/manifests/service.pp
@@ -17,16 +17,18 @@
 #
 # Icinga Development Team <[email protected]>
 #
-class icinga2::service inherits icinga2::params {
+class icinga2::service {
 
   if $module_name != $caller_module_name {
     fail("icinga2::service is a private class of the module icinga2, you're not permitted to use it.")
   }
 
-  $ensure = $icinga2::ensure
-  $enable = $icinga2::enable
+  $ensure         = $icinga2::ensure
+  $enable         = $icinga2::enable
+  $manage_service = $icinga2::manage_service
+  $service        = $icinga2::params::service
 
-  if $icinga2::manage_service {
+  if $manage_service {
     service { $service:
       ensure => $ensure,
       enable => $enable,