From 6b55ccfaeacdb174e3e80912d7cd52951e9de0f2 Mon Sep 17 00:00:00 2001 From: Steven Hardy Date: Tue, 26 Feb 2013 14:20:00 +0000 Subject: [PATCH] heat engine : loadbalancer resource template, refer to StackId Use the new AWS::StackId pseudo parameter to refer to the stack for cfn-hup etc, otherwise the stack lookup by name will fail - using the AWS::StackId parameter means we'll refer to the stack via the full ARN and the CFN API will be able to lookup the nested stack. ref bug 1131666 Change-Id: Ieac738df766ae1f1039e743d465cd080b2090473 --- heat/engine/resources/loadbalancer.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/heat/engine/resources/loadbalancer.py b/heat/engine/resources/loadbalancer.py index 5be550fa..d4c41d27 100644 --- a/heat/engine/resources/loadbalancer.py +++ b/heat/engine/resources/loadbalancer.py @@ -87,7 +87,7 @@ lb_template = r''' "/etc/cfn/cfn-hup.conf" : { "content" : { "Fn::Join" : ["", [ "[main]\n", - "stack=", { "Ref" : "AWS::StackName" }, "\n", + "stack=", { "Ref" : "AWS::StackId" }, "\n", "credential-file=/etc/cfn/cfn-credentials\n", "region=", { "Ref" : "AWS::Region" }, "\n", "interval=60\n" @@ -102,7 +102,7 @@ lb_template = r''' "triggers=post.update\n", "path=Resources.LB_instance.Metadata\n", "action=/opt/aws/bin/cfn-init -s ", - { "Ref": "AWS::StackName" }, + { "Ref": "AWS::StackId" }, " -r LB_instance ", " --region ", { "Ref": "AWS::Region" }, "\n", "runas=root\n", @@ -154,7 +154,7 @@ lb_template = r''' "}\n", "/opt/aws/bin/cfn-init -s ", - { "Ref": "AWS::StackName" }, + { "Ref": "AWS::StackId" }, " -r LB_instance ", " --region ", { "Ref": "AWS::Region" }, "\n", "# install cfn-hup crontab\n", -- 2.45.2