tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make `icinga2::feature' responsible for `icinga2::config' 

refs #6842
This commit is contained in:
Alexander Klimov 2014-09-10 15:14:14 +02:00
parent 4008b86e33
commit a5b3601d44
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.vagrant-puppet/modules/icinga2/manifests/feature.pp
View File

@ -10,9 +10,15 @@
# #
# icinga2::feature { 'example-feature'; } # icinga2::feature { 'example-feature'; }
# #
define icinga2::feature { define icinga2::feature ($source = undef) {
include icinga2 include icinga2
if $source != undef {
icinga2::config { "features-available/${name}":
source => $source,
}
}
file { "/etc/icinga2/features-enabled/${name}.conf": file { "/etc/icinga2/features-enabled/${name}.conf":
ensure => link, ensure => link,
target => "/etc/icinga2/features-available/${name}.conf", target => "/etc/icinga2/features-available/${name}.conf",

10
.vagrant-puppet/modules/icinga2_mysql/manifests/init.pp
View File

@ -31,14 +31,8 @@ class icinga2_mysql {
require => Package['icinga2-ido-mysql'], require => Package['icinga2-ido-mysql'],
} }
icinga2::config { 'features-available/ido-mysql':
source => 'puppet:///modules/icinga2_mysql',
}
icinga2::feature { 'ido-mysql': icinga2::feature { 'ido-mysql':
require => [ source => 'puppet:///modules/icinga2_mysql',
Mysql::Database::Populate['icinga2'], require => Mysql::Database::Populate['icinga2'],
Icinga2::Config['features-available/ido-mysql'],
],
} }
} }