Skip to content

Commit

Permalink
heat engine : DBInstance don't pass credentials to cfn-init
Browse files Browse the repository at this point in the history
Don't create user/accesskey and pass them to cfn-init as resource
metadata for internal nested stacks is not available via the cfn API
so passing them causes an error in the engine logs (and creates some
unnecessary keystone credentials)

fixes bug 1097362

Change-Id: If2fe484d834e3e5730b21a18c363a5bf5a4c45f6
Signed-off-by: Steven Hardy <shardy@redhat.com>
  • Loading branch information
Steven Hardy committed Jan 8, 2013
1 parent c590b58 commit 5fedcd1
Showing 1 changed file with 0 additions and 13 deletions.
13 changes: 0 additions & 13 deletions heat/engine/resources/dbinstance.py
Expand Up @@ -72,16 +72,6 @@
"Resources": {
"DatabaseInstanceCfnUser" : {
"Type" : "AWS::IAM::User"
},
"DatabaseInstanceKeys" : {
"Type" : "AWS::IAM::AccessKey",
"Properties" : {
"UserName" : {"Ref": "DatabaseInstanceCfnUser"}
}
},
"DatabaseInstance": {
"Type": "AWS::EC2::Instance",
"Metadata": {
Expand Down Expand Up @@ -119,9 +109,6 @@
"/opt/aws/bin/cfn-init -s ", { "Ref" : "AWS::StackName" },
" -r DatabaseInstance",
" --access-key ", { "Ref" : "DatabaseInstanceKeys" },
" --secret-key ",
{"Fn::GetAtt": ["DatabaseInstanceKeys", "SecretAccessKey"]},
" --region ", { "Ref" : "AWS::Region" },
" || error_exit 'Failed to run cfn-init'\n",
"# Setup MySQL root password and create a user\n",
Expand Down

0 comments on commit 5fedcd1

Please sign in to comment.