fix #280 add condition to be sure that icinga2 base class is parsed f…

…irst

manifests/feature.pp

@@ -12,7 +12,9 @@
     fail("icinga2::feature is a private define resource of the module icinga2, you're not permitted to use it.")
   }
 
-  include ::icinga2::params
+  if ! defined(Class['::icinga2']) {
+    fail('You must include the icinga2 base class before using any icinga2 feature class!')
+  }
 
   validate_re($ensure, [ '^present$', '^absent$' ],
     "${ensure} isn't supported. Valid values are 'present' and 'absent'.")

manifests/feature/api.pp

@@ -162,7 +162,9 @@
   $bind_port       = undef,
 ) {
 
-  include ::icinga2::params
+  if ! defined(Class['::icinga2']) {
+    fail('You must include the icinga2 base class before using any icinga2 feature class!')
+  }
 
   $conf_dir      = $::icinga2::params::conf_dir
   $pki_dir       = $::icinga2::params::pki_dir

manifests/feature/checker.pp

@@ -16,7 +16,9 @@
   $concurrent_checks = undef,
 ) {
 
-  include ::icinga2::params
+  if ! defined(Class['::icinga2']) {
+    fail('You must include the icinga2 base class before using any icinga2 feature class!')
+  }
 
   $conf_dir = $::icinga2::params::conf_dir
   $_notify  = $ensure ? {

manifests/feature/command.pp

@@ -17,7 +17,9 @@
   $command_path = "${::icinga2::params::run_dir}/cmd/icinga2.cmd",
 ) {
 
-  include ::icinga2::params
+  if ! defined(Class['::icinga2']) {
+    fail('You must include the icinga2 base class before using any icinga2 feature class!')
+  }
 
   $conf_dir = $::icinga2::params::conf_dir
   $_notify  = $ensure ? {

manifests/feature/compatlog.pp

@@ -22,7 +22,9 @@
   $rotation_method = 'DAILY',
 ) {
 
-  include ::icinga2::params
+  if ! defined(Class['::icinga2']) {
+    fail('You must include the icinga2 base class before using any icinga2 feature class!')
+  }
 
   $conf_dir = $::icinga2::params::conf_dir
   $_notify  = $ensure ? {

manifests/feature/debuglog.pp

@@ -18,7 +18,9 @@
   $path     = "${::icinga2::params::log_dir}/debug.log",
 ) {
 
-  include ::icinga2::params
+  if ! defined(Class['::icinga2']) {
+    fail('You must include the icinga2 base class before using any icinga2 feature class!')
+  }
 
   $conf_dir = $::icinga2::params::conf_dir
   $_notify  = $ensure ? {

manifests/feature/gelf.pp

@@ -28,7 +28,9 @@
   $enable_send_perfdata = false,
 ) {
 
-  include ::icinga2::params
+  if ! defined(Class['::icinga2']) {
+    fail('You must include the icinga2 base class before using any icinga2 feature class!')
+  }
 
   $conf_dir = $::icinga2::params::conf_dir
   $_notify  = $ensure ? {

manifests/feature/graphite.pp

@@ -36,7 +36,9 @@
   $enable_send_metadata   = false,
 ) {
 
-  include ::icinga2::params
+  if ! defined(Class['::icinga2']) {
+    fail('You must include the icinga2 base class before using any icinga2 feature class!')
+  }
 
   $conf_dir = $::icinga2::params::conf_dir
   $_notify  = $ensure ? {

manifests/feature/idomysql.pp

@@ -149,7 +149,9 @@
   $import_schema          = false,
 ) {
 
-  include ::icinga2::params
+  if ! defined(Class['::icinga2']) {
+    fail('You must include the icinga2 base class before using any icinga2 feature class!')
+  }
 
   $owner                = $::icinga2::params::user
   $group                = $::icinga2::params::group

manifests/feature/idopgsql.pp

@@ -87,7 +87,9 @@
   $import_schema          = false,
 ) {
 
-  include ::icinga2::params
+  if ! defined(Class['::icinga2']) {
+    fail('You must include the icinga2 base class before using any icinga2 feature class!')
+  }
 
   $conf_dir             = $::icinga2::params::conf_dir
   $ido_pgsql_package    = $::icinga2::params::ido_pgsql_package

manifests/feature/influxdb.pp

@@ -121,7 +121,9 @@
   $flush_threshold        = 1024
 ) {
 
-  include ::icinga2::params
+  if ! defined(Class['::icinga2']) {
+    fail('You must include the icinga2 base class before using any icinga2 feature class!')
+  }
 
   $user          = $::icinga2::params::user
   $group         = $::icinga2::params::group

manifests/feature/livestatus.pp

@@ -39,7 +39,9 @@
   $compat_log_path = "${::icinga2::params::log_dir}/compat",
 ) {
 
-  include ::icinga2::params
+  if ! defined(Class['::icinga2']) {
+    fail('You must include the icinga2 base class before using any icinga2 feature class!')
+  }
 
   $conf_dir = $::icinga2::params::conf_dir
   $_notify  = $ensure ? {

manifests/feature/mainlog.pp

@@ -21,7 +21,9 @@
   $path     = "${::icinga2::params::log_dir}/icinga2.log",
 ) {
 
-  include ::icinga2::params
+  if ! defined(Class['::icinga2']) {
+    fail('You must include the icinga2 base class before using any icinga2 feature class!')
+  }
 
   $conf_dir = $::icinga2::params::conf_dir
   $_notify  = $ensure ? {

manifests/feature/notification.pp

@@ -19,7 +19,9 @@
   $enable_ha = undef,
 ) {
 
-  include ::icinga2::params
+  if ! defined(Class['::icinga2']) {
+    fail('You must include the icinga2 base class before using any icinga2 feature class!')
+  }
 
   $conf_dir = $::icinga2::params::conf_dir
   $_notify  = $ensure ? {

manifests/feature/opentsdb.pp

@@ -20,7 +20,9 @@
   $port                 = '4242',
 ) {
 
-  include ::icinga2::params
+  if ! defined(Class['::icinga2']) {
+    fail('You must include the icinga2 base class before using any icinga2 feature class!')
+  }
 
   $conf_dir = $::icinga2::params::conf_dir
   $_notify  = $ensure ? {

manifests/feature/perfdata.pp

@@ -50,7 +50,9 @@
   $rotation_interval       = '30s',
 ) {
 
-  include ::icinga2::params
+  if ! defined(Class['::icinga2']) {
+    fail('You must include the icinga2 base class before using any icinga2 feature class!')
+  }
 
   $conf_dir = $::icinga2::params::conf_dir
   $_notify  = $ensure ? {

manifests/feature/statusdata.pp

@@ -29,7 +29,9 @@
   $update_interval = '15s',
 ) {
 
-  include ::icinga2::params
+  if ! defined(Class['::icinga2']) {
+    fail('You must include the icinga2 base class before using any icinga2 feature class!')
+  }
 
   $conf_dir = $::icinga2::params::conf_dir
   $_notify  = $ensure ? {

manifests/feature/syslog.pp

@@ -17,7 +17,9 @@
   $severity = 'warning',
 ) {
 
-  include ::icinga2::params
+  if ! defined(Class['::icinga2']) {
+    fail('You must include the icinga2 base class before using any icinga2 feature class!')
+  }
 
   $conf_dir  = $::icinga2::params::conf_dir
   $_notify   = $ensure ? {

manifests/object.pp

@@ -82,7 +82,6 @@
   }
 
   include ::icinga2::params
-  require ::icinga2::config
 
   case $::osfamily {
     'windows': {

manifests/params.pp

@@ -14,10 +14,6 @@
 #
 class icinga2::params {
 
-  if ! defined(Class['::icinga2']) {
-    fail('You must include the icinga2 base class before using any icinga2 feature class or any define resource!')
-  }
-
   $package          = 'icinga2'
   $service          = 'icinga2'
   $plugins          = [ 'plugins', 'plugins-contrib', 'windows-plugins', 'nscp' ]