Clean up module `icinga2-mysql'

refs #6842
Icinga · Aug 28, 2014 · e963479 · e963479
1 parent f6a9c67
commit e963479
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/.vagrant-puppet/modules/icinga2-mysql/manifests/init.pp b/.vagrant-puppet/modules/icinga2-mysql/manifests/init.pp
@@ -1,5 +1,7 @@
 class icinga2-mysql {
+  include icinga-packages
   include icinga2
+  include mysql
 
   mysql::database::populate { 'icinga2':
     username => 'icinga2',
@@ -10,20 +12,19 @@
   }
 
   icinga2::feature { 'ido-mysql':
-    require => Exec['populate-icinga2-mysql-db'],
+    require => Mysql::Database::Populate['icinga2'],
   }
 
   package { 'icinga2-ido-mysql':
     ensure => latest,
-    require => Yumrepo['icinga2-repo'],
-    alias => 'icinga2-ido-mysql'
+    require => Class['icinga-packages'],
   }
 
   file { '/etc/icinga2/features-available/ido-mysql.conf':
     source  => 'puppet:////vagrant/.vagrant-puppet/files/etc/icinga2/features-available/ido-mysql.conf',
     owner   => 'icinga',
     group   => 'icinga',
-    require => Package['icinga2'],
+    require => Class['icinga2'],
     notify => Service['icinga2'],
   }