aboutsummaryrefslogtreecommitdiffstats
path: root/overcloud-source.yaml
diff options
context:
space:
mode:
authorClint Byrum <clint@fewbar.com>2013-08-15 11:35:56 -0700
committerClint Byrum <clint@fewbar.com>2013-08-15 20:26:31 -0700
commitbf7b11120921537f7f0f8c1994ed0ffdf8152220 (patch)
treef4983495e91827ad69f947bf983bcca3de9513db /overcloud-source.yaml
parent07ac7428976ea5a91c3371529be734df0ef38562 (diff)
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
Diffstat (limited to 'overcloud-source.yaml')
-rw-r--r--overcloud-source.yaml9
1 files changed, 7 insertions, 2 deletions
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: