Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Puppet 2.6 fix #163

Merged
merged 2 commits into from

3 participants

@domcleal

No description provided.

@puppetcla

CLA Signed by domcleal on 2011-06-13 21:00:00 -0700

@kbarber
Owner

@domcleal lol - I was seriously half way through patching this myself just then, and noticed this test in travis-ci and your branch - kind of creepy and cool at the same time +1

@kbarber kbarber merged commit 8000041 into puppetlabs:master
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
This page is out of date. Refresh to see the latest.
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}":
Something went wrong with that request. Please try again.