From bf7b11120921537f7f0f8c1994ed0ffdf8152220 Mon Sep 17 00:00:00 2001 From: Clint Byrum Date: Thu, 15 Aug 2013 11:35:56 -0700 Subject: Migrate nova-compute-instance to split Metadata. The file was using the old 0.0.0.0 method from heat-localip, but it was missed when converting the other templates to a split Metadata approach to enable a machine to know its own IP. Change-Id: I0b117de12416a52950b1c7079f659df8649d67f9 --- overcloud-source.yaml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'overcloud-source.yaml') diff --git a/overcloud-source.yaml b/overcloud-source.yaml index cb385ed1..d86d5839 100644 --- a/overcloud-source.yaml +++ b/overcloud-source.yaml @@ -40,6 +40,7 @@ Resources: Properties: AllowedResources: - NovaCompute0 + - NovaCompute0Config Type: OS::Heat::AccessPolicy Key: Properties: @@ -56,10 +57,10 @@ Resources: Policies: - Ref: ComputeAccessPolicy Type: AWS::IAM::User - NovaCompute0: + NovaCompute0Config: Type: FileInclude Path: nova-compute-instance.yaml - SubKey: Resources.NovaCompute0 + SubKey: Resources.NovaCompute0Config Parameters: NovaApiHost: {"Fn::GetAtt": [notcompute, PrivateIp]} KeystoneHost: {"Fn::GetAtt": [notcompute, PrivateIp]} @@ -74,6 +75,10 @@ Resources: NeutronBridgeMappings: "" RabbitPassword: "guest" ServicePassword: "unset" + NovaCompute0: + Type: FileInclude + Path: nova-compute-instance.yaml + SubKey: Resources.NovaCompute0 User: Properties: Policies: -- cgit 1.2.3-korg