diff options
author | mh <mh@immerda.ch> | 2012-06-08 13:04:06 -0300 |
---|---|---|
committer | mh <mh@immerda.ch> | 2012-06-08 13:04:06 -0300 |
commit | e4ca510b7ca6e4d358e87ac0faa365d492848170 (patch) | |
tree | f18e6b2eb1151fb633f9f43261c916d21f7d0c0c /manifests/default_database.pp | |
parent | 7f4ae6753f15876df2f3f2336b99d8ee9f47b694 (diff) |
refactor things for >2.7
Diffstat (limited to 'manifests/default_database.pp')
-rw-r--r-- | manifests/default_database.pp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/manifests/default_database.pp b/manifests/default_database.pp index 7465eaf..cfa1132 100644 --- a/manifests/default_database.pp +++ b/manifests/default_database.pp @@ -11,21 +11,21 @@ define mysql::default_database( 'absent' => $name, default => $username } - mysql_database{"$name": + mysql_database{$name: 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] } else { mysql_user{"${real_username}@${host}": ensure => $ensure, require => [ - Mysql_database["$name"] + Mysql_database[$name] ], } $grant_require = [ - Mysql_database["$name"], + Mysql_database[$name], Mysql_user["${real_username}@${host}"] ] if $ensure == 'present' { @@ -33,7 +33,7 @@ define mysql::default_database( password_hash => $password ? { 'trocla' => trocla("mysql_${real_username}",'mysql'), default => $password_is_encrypted ? { - true => "$password", + true => $password, default => mysql_password("$password") }, }, @@ -42,7 +42,7 @@ define mysql::default_database( } if $ensure == 'present' { mysql_grant{"${real_username}@${host}/${name}": - privileges => "$privileges", + privileges => $privileges, require => $grant_require, } } |