icinga2-mysql: remove file '/etc/icinga2/features-enabled/ido-mysql.conf'

refs #6842
This commit is contained in:
Alexander Klimov 2014-08-28 16:56:10 +02:00
parent 3d75d2e9c9
commit cc4907bae6
1 changed files with 10 additions and 17 deletions

View File

@ -1,6 +1,10 @@
class icinga2-mysql { class icinga2-mysql {
include icinga-packages include icinga-packages
include icinga2
package { 'icinga2-ido-mysql':
ensure => latest,
require => Class['icinga-packages'],
}
mysql::database::populate { 'icinga2': mysql::database::populate { 'icinga2':
username => 'icinga2', username => 'icinga2',
@ -10,27 +14,16 @@ class icinga2-mysql {
require => Package['icinga2-ido-mysql'], require => Package['icinga2-ido-mysql'],
} }
icinga2::feature { 'ido-mysql':
require => Mysql::Database::Populate['icinga2'],
}
package { 'icinga2-ido-mysql':
ensure => latest,
require => Class['icinga-packages'],
}
file { '/etc/icinga2/features-available/ido-mysql.conf': file { '/etc/icinga2/features-available/ido-mysql.conf':
source => 'puppet:///modules/icinga2-mysql/etc/icinga2/features-available/ido-mysql.conf', source => 'puppet:///modules/icinga2-mysql/etc/icinga2/features-available/ido-mysql.conf',
owner => 'icinga', owner => 'icinga',
group => 'icinga', group => 'icinga',
notify => Service['icinga2'],
} }
file { '/etc/icinga2/features-enabled/ido-mysql.conf': icinga2::feature { 'ido-mysql':
ensure => 'link', require => [
target => '/etc/icinga2/features-available/ido-mysql.conf', Mysql::Database::Populate['icinga2'],
owner => 'root', File['/etc/icinga2/features-available/ido-mysql.conf']
group => 'root', ],
require => Package['icinga2-ido-mysql'],
} }
} }