Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #163 from domcleal/pp26

Puppet 2.6 fix
  • Loading branch information...
commit 8000041e9f08d94fff237e5cbf37d7e547aabb3c 2 parents 1d10682 + fabb064
@kbarber kbarber authored
Showing with 6 additions and 4 deletions.
  1. +1 −0  .fixtures.yml
  2. +5 −4 manifests/db.pp
View
1  .fixtures.yml
@@ -1,5 +1,6 @@
fixtures:
repositories:
"stdlib": "git://github.com/puppetlabs/puppetlabs-stdlib"
+ "create_resources": "git://github.com/puppetlabs/puppetlabs-create_resources.git"
symlinks:
"mysql": "#{source_dir}"
View
9 manifests/db.pp
@@ -55,10 +55,11 @@
before => Database_user["${user}@${host}"],
}
- ensure_resource('database_user', "${user}@${host}", { ensure => $ensure,
- password_hash => mysql_password($password),
- provider => 'mysql'
- })
+ $user_resource = { ensure => $ensure,
+ password_hash => mysql_password($password),
+ provider => 'mysql'
+ }
+ ensure_resource('database_user', "${user}@${host}", $user_resource)
if $ensure == 'present' {
database_grant { "${user}@${host}/${name}":
Please sign in to comment.
Something went wrong with that request. Please try again.