Merge pull request #599 from Icinga/bug/missing-epel-repo

add missing EPEL repo on RedHat
voxpupuli · Jan 8, 2020 · e3133e2 · e3133e2
2 parents ca63efb + aba7283
commit e3133e2
Show file tree

Hide file tree

Showing 20 changed files with 118 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -132,6 +132,15 @@ class { '::icinga2':
   manage_repo => true,
 }
 ```
+*Notice*: Since Icinga v2.11.0 on RedHat the EPEL-Repository is required to install the Boost libraries. EPEL is NOT managed by this module so you have to do this on your own in front of icinga2 class, e.g. as `yum_repo` or if you've an internet connection as a simple package resource like:
+
+``` puppet
+package { 'epel-release': }
+
+class { '::icinga2':
+  manage_repo => true,
+}
+``` 
 
 *Info:* If you are using the [Icinga Web 2](https://github.com/Icinga/puppet-icingaweb2/) Puppet module on the same
 server, make sure to disable the repository management for one of the modules!
@@ -625,7 +634,7 @@ It's not currently possible to use arrays or dictionaries in a string, like
 
 #### Reading objects from hiera data
 
-The following example is for puppet 4 and higher. It shows how icinga2 objects can be read from
+The following example shows how icinga2 objects can be read from
 a hiera datastore. See also examples/objects_from_hiera.pp.
 
 ```

diff --git a/examples/example4/profile/manifests/agent.pp b/examples/example4/profile/manifests/agent.pp
@@ -7,6 +7,12 @@
 
   contain ::profile::icinga2::plugins
 
+  case $::osfamily {
+    'redhat': {
+      package { 'epel-release': }
+    } # RedHat
+  }
+
   class { '::icinga2':
     manage_repo => true,
     confd       => false,

diff --git a/examples/example4/profile/manifests/master.pp b/examples/example4/profile/manifests/master.pp
@@ -2,6 +2,12 @@
 
   contain ::profile::icinga2::plugins
 
+  case $::osfamily {
+    'redhat': {
+      package { 'epel-release': }
+    } # RedHat
+  }
+
   class { '::icinga2':
     manage_repo    => true,
     purge_features => false,

diff --git a/examples/example4/profile/manifests/slave.pp b/examples/example4/profile/manifests/slave.pp
@@ -8,6 +8,12 @@
 
   contain ::profile::icinga2::plugins
 
+  case $::osfamily {
+    'redhat': {
+      package { 'epel-release': }
+    } # RedHat
+  }
+
   class { '::icinga2':
     manage_repo => true,
     confd       => false,

diff --git a/examples/init_api.pp b/examples/init_api.pp
@@ -1,3 +1,9 @@
+case $::osfamily {
+  'redhat': {
+    package { 'epel-release': }
+  } # RedHat
+}
+
 class { 'icinga2':
   manage_repo => true,
 }

diff --git a/examples/init_confd.pp b/examples/init_confd.pp
@@ -1,3 +1,9 @@
+case $::osfamily {
+  'redhat': {
+    package { 'epel-release': }
+  } # RedHat
+}
+
 class { 'icinga2':
   manage_repo => true,
   confd       => '/etc/icinga2/local.d',

diff --git a/examples/init_idomysql.pp b/examples/init_idomysql.pp
@@ -1,3 +1,9 @@
+case $::osfamily {
+  'redhat': {
+    package { 'epel-release': }
+  } # RedHat
+}
+
 include ::mysql::server
 
 mysql::db { 'icinga2':

diff --git a/examples/init_idomysql_ssl.pp b/examples/init_idomysql_ssl.pp
@@ -1,3 +1,9 @@
+case $::osfamily {
+  'redhat': {
+    package { 'epel-release': }
+  } # RedHat
+}
+
 file { '/etc/mysql':
   ensure => directory,
 }

diff --git a/examples/init_idopgsql.pp b/examples/init_idopgsql.pp
@@ -1,3 +1,9 @@
+case $::osfamily {
+  'redhat': {
+    package { 'epel-release': }
+  } # RedHat
+}
+
 include ::postgresql::server
 
 postgresql::server::db { 'icinga2':

diff --git a/examples/init_influxdb.pp b/examples/init_influxdb.pp
@@ -1,3 +1,9 @@
+case $::osfamily {
+  'redhat': {
+    package { 'epel-release': }
+  } # RedHat
+}
+
 class { 'icinga2':
   manage_repo => true,
 }

diff --git a/examples/init_master.pp b/examples/init_master.pp
@@ -1,3 +1,9 @@
+case $::osfamily {
+  'redhat': {
+    package { 'epel-release': }
+  } # RedHat
+}
+
 class { '::icinga2':
   manage_repo => true,
   constants   => {

diff --git a/examples/init_plugins.pp b/examples/init_plugins.pp
@@ -1,3 +1,9 @@
+case $::osfamily {
+  'redhat': {
+    package { 'epel-release': }
+  } # RedHat
+}
+
 class { 'icinga2':
   manage_repo => true,
   plugins     => [ 'plugins', 'plugins-contrib', 'windows-plugins', 'nscp' ]

diff --git a/examples/init_repo.pp b/examples/init_repo.pp
@@ -1,3 +1,15 @@
+case $::osfamily {
+  'redhat': {
+    package { 'epel-release': }
+  } # RedHat
+}
+
+case $::osfamily {
+  'redhat': {
+    package { 'epel-release': }
+  } # RedHat
+}
+
 class { 'icinga2':
   manage_repo => true,
 }
diff --git a/examples/init_slave.pp b/examples/init_slave.pp
@@ -1,3 +1,9 @@
+case $::osfamily {
+  'redhat': {
+    package { 'epel-release': }
+  } # RedHat
+}
+
 $master_cert = 'master.localdomain'
 $master_ip   = '192.168.5.16'
 

diff --git a/examples/init_slave_validate.pp b/examples/init_slave_validate.pp
@@ -1,3 +1,9 @@
+case $::osfamily {
+  'redhat': {
+    package { 'epel-release': }
+  } # RedHat
+}
+
 $master_cert = 'master.localdomain'
 $master_ip   = '192.168.5.12'
 

diff --git a/examples/init_syslog.pp b/examples/init_syslog.pp
@@ -1,3 +1,9 @@
+case $::osfamily {
+  'redhat': {
+    package { 'epel-release': }
+  } # RedHat
+}
+
 class { 'icinga2':
   manage_repo => true,
 }

diff --git a/examples/objects_from_hiera.pp b/examples/objects_from_hiera.pp
@@ -27,6 +27,11 @@
 #      - generic-service
 #    target: /etc/icinga2/conf.d/services.conf
 
+case $::osfamily {
+  'redhat': {
+    package { 'epel-release': }
+  } # RedHat
+}
 
 class { 'icinga2':
   manage_repo => true,

diff --git a/metadata.json b/metadata.json
@@ -10,7 +10,7 @@
   "dependencies": [
     {
       "name": "puppetlabs/stdlib",
-      "version_requirement": ">= 4.16.0 < 7.0.0"
+      "version_requirement": ">= 5.0.0 < 7.0.0"
     },
     {
       "name": "puppetlabs/concat",

diff --git a/spec/acceptance/class_spec.rb b/spec/acceptance/class_spec.rb
@@ -5,6 +5,11 @@
   describe 'with API, IDO mysql and pgsql' do
     let(:pp) do
       <<-MANIFEST
+        case $::osfamily {
+          'redhat': {
+            package { 'epel-release': }
+          } # RedHat
+        }
         class { 'icinga2':
           manage_repo => true,
           constants   => {

diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
@@ -2,7 +2,7 @@
 require 'beaker/puppet_install_helper'
 
 # Install Puppet on all hosts
-install_puppet_agent_on(hosts, options)
+install_puppet_agent_on(hosts, :puppet_collection => 'puppet5')
 
 RSpec.configure do |c|
   module_root = File.expand_path(File.join(File.dirname(__FILE__), '..'))