Merge pull request #154 from Paulche/master

Fix issue with redeclaration of database_user via mysql::db

Author: kbarber

manifests/db.pp

@@ -52,14 +52,13 @@
     charset  => $charset,
     provider => 'mysql',
     require  => Class['mysql::server'],
+    before   => Database_user["${user}@${host}"],
   }
 
-  database_user { "${user}@${host}":
-    ensure        => $ensure,
-    password_hash => mysql_password($password),
-    provider      => 'mysql',
-    require       => Database[$name],
-  }
+  ensure_resource('database_user', "${user}@${host}", { ensure        => $ensure,
+                                                        password_hash => mysql_password($password),
+                                                        provider      => 'mysql'
+                                                      })
 
   if $ensure == 'present' {
     database_grant { "${user}@${host}/${name}":

spec/unit/mysql_password_spec.rb

@@ -7,7 +7,11 @@
   end
 
   before :each do
-    @scope = Puppet::Parser::Scope.new
+    @scope = if Puppet.version =~ /^3/
+               Puppet::Parser::Scope.new_for_test_harness('localhost')
+             else
+               Puppet::Parser::Scope.new
+             end
   end
 
   it "should exist" do