Browse Source

heat engine : DBInstance don't pass credentials to cfn-init

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>
changes/27/19227/1
Steven Hardy 9 years ago
parent
commit
5fedcd1ce0
  1. 13
      heat/engine/resources/dbinstance.py

13
heat/engine/resources/dbinstance.py

@ -72,16 +72,6 @@ mysql_template = r'''
"Resources": {
"DatabaseInstanceCfnUser" : {
"Type" : "AWS::IAM::User"
},
"DatabaseInstanceKeys" : {
"Type" : "AWS::IAM::AccessKey",
"Properties" : {
"UserName" : {"Ref": "DatabaseInstanceCfnUser"}
}
},
"DatabaseInstance": {
"Type": "AWS::EC2::Instance",
"Metadata": {
@ -119,9 +109,6 @@ mysql_template = r'''
"/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",

Loading…
Cancel
Save