Clean up module `icinga2-mysql'

refs #6842
This commit is contained in:
Alexander Klimov 2014-08-28 13:33:47 +02:00
parent f6a9c67fa2
commit 5c0f998085
1 changed files with 4 additions and 4 deletions

View File

@ -1,4 +1,5 @@
class icinga2-mysql { class icinga2-mysql {
include icinga-packages
include icinga2 include icinga2
mysql::database::populate { 'icinga2': mysql::database::populate { 'icinga2':
@ -10,20 +11,19 @@ class icinga2-mysql {
} }
icinga2::feature { 'ido-mysql': icinga2::feature { 'ido-mysql':
require => Exec['populate-icinga2-mysql-db'], require => Mysql::Database::Populate['icinga2'],
} }
package { 'icinga2-ido-mysql': package { 'icinga2-ido-mysql':
ensure => latest, ensure => latest,
require => Yumrepo['icinga2-repo'], require => Class['icinga-packages'],
alias => 'icinga2-ido-mysql'
} }
file { '/etc/icinga2/features-available/ido-mysql.conf': file { '/etc/icinga2/features-available/ido-mysql.conf':
source => 'puppet:////vagrant/.vagrant-puppet/files/etc/icinga2/features-available/ido-mysql.conf', source => 'puppet:////vagrant/.vagrant-puppet/files/etc/icinga2/features-available/ido-mysql.conf',
owner => 'icinga', owner => 'icinga',
group => 'icinga', group => 'icinga',
require => Package['icinga2'], require => Class['icinga2'],
notify => Service['icinga2'], notify => Service['icinga2'],
} }