fix dependency issues

1 files changed, 16 insertions, 16 deletions

diff --git a/manifests/default_database.pp b/manifests/default_database.pp
index cfa1132..0afc542 100644
--- a/manifests/default_database.pp
+++ b/manifests/default_database.pp
@@ -12,38 +12,38 @@ define mysql::default_database(
     default => $username
   }
   mysql_database{$name:
-    ensure => $ensure
+    ensure  => $ensure
   }
   if $password == 'absent' and $ensure != 'absent' {
       info("we don't create the user for database: ${name}")
-      $grant_require = Mysql_database[$name]
+      $grant_require = [ Mysql_database[$name], Exec['mysql_set_rootpw'] ]
   } else {
     mysql_user{"${real_username}@${host}":
-      ensure => $ensure,
-      require => [
-        Mysql_database[$name]
-      ],
+      ensure  => $ensure,
+      require => Mysql_database[$name],
     }
     $grant_require = [
       Mysql_database[$name],
-      Mysql_user["${real_username}@${host}"]
+      Mysql_user["${real_username}@${host}"],
+      Exec['mysql_set_rootpw']
     ]
     if $ensure == 'present' {
-      Mysql_user["${real_username}@${host}"]{
-        password_hash => $password ? {
-        'trocla' => trocla("mysql_${real_username}",'mysql'),
-        default => $password_is_encrypted ? {
-            true => $password,
-            default => mysql_password("$password")
+        $password_hash = $password ? {
+          'trocla'  => trocla("mysql_${real_username}",'mysql'),
+          default   => $password_is_encrypted ? {
+            true    => $password,
+            default => mysql_password($password)
           },
-        },
+        }
+      Mysql_user["${real_username}@${host}"]{
+        password_hash => $password_hash
       }
     }
   }
   if $ensure == 'present' {
     mysql_grant{"${real_username}@${host}/${name}":
-      privileges => $privileges,
-      require => $grant_require,
+      privileges  => $privileges,
+      require     => $grant_require,
     }
   }
 }