Outsource 'icing_web' database creation into mysql::database::create

refs #6842
Icinga · Aug 5, 2014 · 05afbee · 05afbee
1 parent a110b25
commit 05afbee
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/.vagrant-puppet/manifests/default.pp b/.vagrant-puppet/manifests/default.pp
@@ -639,12 +639,10 @@
   require => [ File['/etc/init.d/icinga_command_proxy'], Service['icinga-mysql'], Service['icinga-pgsql'] ]
 }
 
-exec { 'create-mysql-icinga_web-db':
-  unless  => 'mysql -uicinga_web -picinga_web icinga_web',
-  command => 'mysql -uroot -e "CREATE DATABASE icinga_web; \
-              GRANT ALL ON icinga_web.* TO icinga_web@localhost \
-              IDENTIFIED BY \'icinga_web\';"',
-  require => Service['mysqld']
+mysql::database::create { 'icinga_web':
+  username => 'icinga_web',
+  password => 'icinga_web',
+  privileges => 'ALL',
 }
 
 cmmi { 'icinga-web':