opuppet/module-icinga2
5
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix the exec resource commands so they use the new commands in 2.2 to enable/disable features instead of the old ones from 2.1 and before.

Browse source 
refs#7714 : https://dev.icinga.org/issues/7714
This commit is contained in:
Nick Chappell 2014-11-25 21:27:00 -08:00
parent 8071efdb0a
commit 00cfa7abf8
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
manifests/server/features/disable.pp
View file

@ -1,9 +1,9 @@
# Disable Icinga 2 Features/Modules
define icinga2::server::features::disable () {
exec { "icinga2-disable-feature ${name}":
exec { "icinga2 disable feature ${name}":
user => 'root',
path => '/usr/bin:/usr/sbin:/bin/:/sbin',
command => "/usr/sbin/icinga2-disable-feature ${name}",
command => "/usr/sbin/icinga2 disable feature ${name}",
unless => "[ ! -f /etc/icinga2/features-enabled/${name}.conf ]",
require => Class['icinga2::server::install::packages'],
}

4
manifests/server/features/enable.pp
View file

@ -1,9 +1,9 @@
# Enable Icinga 2 Features/Modules
define icinga2::server::features::enable () {
exec { "icinga2-enable-feature ${name}":
exec { "icinga2 enable feature ${name}":
user => 'root',
path => '/usr/bin:/usr/sbin:/bin/:/sbin',
command => "/usr/sbin/icinga2-enable-feature ${name}",
command => "/usr/sbin/icinga2 enable feature ${name}",
unless => "[ ! -f /etc/icinga2/features-available/${name}.conf ] || [ -f /etc/icinga2/features-enabled/${name}.conf ]",
require => Class['icinga2::server::install::packages'],
}

4
manifests/server/install.pp
View file

@ -149,7 +149,7 @@ class icinga2::server::install::execs inherits icinga2::server {
exec { 'mysql_module_enable':
user => 'root',
path => '/usr/bin:/usr/sbin:/bin/:/sbin',
command => '/usr/sbin/icinga2-enable-feature ido-mysql && touch /etc/icinga2/mysql_module_loaded.txt',
command => '/usr/sbin/icinga2 enable feature ido-mysql && touch /etc/icinga2/mysql_module_loaded.txt',
creates => '/etc/icinga2/mysql_module_loaded.txt',
require => Exec['mysql_schema_load'],
}
@ -168,7 +168,7 @@ class icinga2::server::install::execs inherits icinga2::server {
exec { 'postgres_module_enable':
user => 'root',
path => '/usr/bin:/usr/sbin:/bin/:/sbin',
command => '/usr/sbin/icinga2-enable-feature ido-pgsql && touch /etc/icinga2/postgres_module_loaded.txt',
command => '/usr/sbin/icinga2 enable feature ido-pgsql && touch /etc/icinga2/postgres_module_loaded.txt',
creates => '/etc/icinga2/postgres_module_loaded.txt',
require => Exec['postgres_schema_load'],
}