Merge branch 'enhancement/add-condition-to-be-sure-that-icinga2-base-…

…class-is-parsed-first-280'

manifests/feature.pp

@@ -7,12 +7,15 @@
   $ensure  = present,
   $feature = $title,
 ) {
-  require ::icinga2::config
 
   if defined($caller_module_name) and $module_name != $caller_module_name and $caller_module_name != '' {
     fail("icinga2::feature is a private define resource of the module icinga2, you're not permitted to use it.")
   }
 
+  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,6 +162,10 @@
   $bind_port       = undef,
 ) {
 
+  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
   $ca_dir        = $::icinga2::params::ca_dir

manifests/feature/checker.pp

@@ -16,6 +16,10 @@
   $concurrent_checks = undef,
 ) {
 
+  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 ? {
     'present' => Class['::icinga2::service'],

manifests/feature/command.pp

@@ -17,6 +17,10 @@
   $command_path = "${::icinga2::params::run_dir}/cmd/icinga2.cmd",
 ) {
 
+  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 ? {
     'present' => Class['::icinga2::service'],

manifests/feature/compatlog.pp

@@ -22,6 +22,10 @@
   $rotation_method = 'DAILY',
 ) {
 
+  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 ? {
     'present' => Class['::icinga2::service'],

manifests/feature/debuglog.pp

@@ -18,6 +18,10 @@
   $path     = "${::icinga2::params::log_dir}/debug.log",
 ) {
 
+  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 ? {
     'present' => Class['::icinga2::service'],

manifests/feature/gelf.pp

@@ -28,6 +28,10 @@
   $enable_send_perfdata = false,
 ) {
 
+  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 ? {
     'present' => Class['::icinga2::service'],

manifests/feature/graphite.pp

@@ -36,6 +36,10 @@
   $enable_send_metadata   = false,
 ) {
 
+  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 ? {
     'present' => Class['::icinga2::service'],

manifests/feature/idomysql.pp

@@ -149,8 +149,9 @@
   $import_schema          = false,
 ) {
 
-  require ::icinga2::config
-  require ::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,8 +87,9 @@
   $import_schema          = false,
 ) {
 
-  require ::icinga2::config
-  require ::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,6 +121,10 @@
   $flush_threshold        = 1024
 ) {
 
+  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
   $node_name     = $::icinga2::_constants['NodeName']

manifests/feature/livestatus.pp

@@ -39,6 +39,10 @@
   $compat_log_path = "${::icinga2::params::log_dir}/compat",
 ) {
 
+  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 ? {
     'present' => Class['::icinga2::service'],

manifests/feature/mainlog.pp

@@ -21,6 +21,10 @@
   $path     = "${::icinga2::params::log_dir}/icinga2.log",
 ) {
 
+  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 ? {
     'present' => Class['::icinga2::service'],

manifests/feature/notification.pp

@@ -19,6 +19,10 @@
   $enable_ha = undef,
 ) {
 
+  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 ? {
     'present' => Class['::icinga2::service'],

manifests/feature/opentsdb.pp

@@ -20,6 +20,10 @@
   $port                 = '4242',
 ) {
 
+  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 ? {
     'present' => Class['::icinga2::service'],

manifests/feature/perfdata.pp

@@ -50,6 +50,10 @@
   $rotation_interval       = '30s',
 ) {
 
+  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 ? {
     'present' => Class['::icinga2::service'],

manifests/feature/statusdata.pp

@@ -29,6 +29,10 @@
   $update_interval = '15s',
 ) {
 
+  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 ? {
     'present' => Class['::icinga2::service'],

manifests/feature/syslog.pp

@@ -17,6 +17,10 @@
   $severity = 'warning',
 ) {
 
+  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 ? {
     'present' => Class['::icinga2::service'],

manifests/object.pp

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