Merge pull request chef-boneyard#9 from rackerjoe/master

per shep
FER-HT · Apr 24, 2012 · 2baeed7 · 2baeed7
2 parents 1743f21 + 0016f47
commit 2baeed7
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/attributes/default.rb b/attributes/default.rb
@@ -1,8 +1,9 @@
 default["controller_ipaddress"] = node["ipaddress"]
 
 # Adding these as blank 
-#default["credentials"]["EC2"]["admin"]["access"] = ""
-#default["credentials"]["EC2"]["admin"]["secret"] = ""
+# this needs to be here for the initial deep-merge to work
+default["credentials"]["EC2"]["admin"]["access"] = ""
+default["credentials"]["EC2"]["admin"]["secret"] = ""
 
 default["keystone"]["db"] = "keystone"
 default["keystone"]["db_user"] = "keystone"