From 5f977328a9b9f67bcbf9a9a08c420bb275909b22 Mon Sep 17 00:00:00 2001
From: Alexander Klimov <alexander.klimov@netways.de>
Date: Thu, 28 Aug 2014 14:16:21 +0200
Subject: [PATCH] Clean up `mysql::database'

refs #6842
---
 .vagrant-puppet/modules/icinga2-mysql/manifests/init.pp | 2 +-
 .vagrant-puppet/modules/mysql/manifests/database.pp     | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/.vagrant-puppet/modules/icinga2-mysql/manifests/init.pp b/.vagrant-puppet/modules/icinga2-mysql/manifests/init.pp
index 46c1f58d7..56aaa2ef0 100644
--- a/.vagrant-puppet/modules/icinga2-mysql/manifests/init.pp
+++ b/.vagrant-puppet/modules/icinga2-mysql/manifests/init.pp
@@ -7,7 +7,7 @@ class icinga2-mysql {
     password => 'icinga2',
     privileges => 'SELECT,INSERT,UPDATE,DELETE',
     schemafile => '/usr/share/icinga2-ido-mysql/schema/mysql.sql',
-    requirement => Package['icinga2-ido-mysql'],
+    require => Package['icinga2-ido-mysql'],
   }
 
   icinga2::feature { 'ido-mysql':
diff --git a/.vagrant-puppet/modules/mysql/manifests/database.pp b/.vagrant-puppet/modules/mysql/manifests/database.pp
index bc9bee6a8..dd7c89c69 100644
--- a/.vagrant-puppet/modules/mysql/manifests/database.pp
+++ b/.vagrant-puppet/modules/mysql/manifests/database.pp
@@ -6,13 +6,11 @@ define mysql::database::create ($username, $password, $privileges) {
     command => "mysql -uroot -e \"CREATE DATABASE ${name}; \
 GRANT ${privileges} ON ${name}.* TO ${username}@localhost \
 IDENTIFIED BY '${password}';\"",
-    require => Service['mysqld']
+    require => Class['mysql']
   }
 }
 
-define mysql::database::populate ($username, $password, $privileges, $schemafile, $requirement) {
-  include mysql
-
+define mysql::database::populate ($username, $password, $privileges, $schemafile) {
   mysql::database::create { $name:
     username => $username,
     password => $password,
@@ -22,6 +20,6 @@ define mysql::database::populate ($username, $password, $privileges, $schemafile
   exec { "populate-${name}-mysql-db":
     unless  => "mysql -u${username} -p${password} ${name} -e \"SELECT * FROM icinga_dbversion;\" &> /dev/null",
     command => "mysql -uroot ${name} < ${schemafile}",
-    require => [ $requirement, Exec["create-mysql-${name}-db"] ]
+    require => Mysql::Database::Create[$name],
   }
 }