diff options
| author |   Dan Prince <dprince@redhat.com> | 2013-11-25 21:21:05 -0500 |
|---|---|---|
| committer | Dan Prince <dprince@redhat.com> | 2013-11-26 08:58:42 -0500 |
| commit | dbda731e48f6bb29cd40cfa774a751c2566b6297 (patch) | |
| tree | 81acd8f14c34152a83ee761fe478fcc84dfe5fe6 /undercloud-source.yaml | |
| parent | 38fcc17219bc2457be42e323295784fd0e04747c (diff) | |
Name the undercloud resources with 'undercloud'.
Using notcompute for the undercloud resources is a bit confusing
so lets rename them accordingly. This change shouldn't effect
the devtest scripts or toci because we don't pass a parameter
in for the undercloud.
Change-Id: I33c28a3554fe117c5a0a6e641ea277f7a95f2b35
Diffstat (limited to 'undercloud-source.yaml')
| -rw-r--r-- | undercloud-source.yaml | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/undercloud-source.yaml b/undercloud-source.yaml index 9dcbf538..f017f62a 100644 --- a/undercloud-source.yaml +++ b/undercloud-source.yaml @@ -50,7 +50,7 @@ Resources: AccessPolicy: Properties: AllowedResources: - - notcomputeConfig + - undercloudConfig Type: OS::Heat::AccessPolicy Key: Properties: @@ -62,13 +62,13 @@ Resources: Policies: - Ref: AccessPolicy Type: AWS::IAM::User - notcomputeConfig: + undercloudConfig: Type: AWS::AutoScaling::LaunchConfiguration Properties: ImageId: '0' InstanceType: foo Metadata: - OpenStack::Role: notcomputeConfig + OpenStack::Role: undercloudConfig OpenStack::Heat::Stack: {} Openstack::ImageBuilder::Elements: [ boot-stack, heat-cfntools, neutron-network-node ] admin-password: @@ -81,7 +81,7 @@ Resources: - Fn::Select: - "ctlplane" - Fn::GetAtt: - - notcompute + - undercloud - networks cinder: db: mysql://cinder:unset@localhost/cinder @@ -104,25 +104,25 @@ Resources: Fn::Join: - '' - - http:// - - {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [ notcompute, networks ]} ]}]} + - {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [ undercloud, networks ]} ]}]} - ":8003" metadata_server_url: Fn::Join: - '' - - http:// - - {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [ notcompute, networks ]} ]}]} + - {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [ undercloud, networks ]} ]}]} - ":8000" waitcondition_server_url: Fn::Join: - '' - - http:// - - {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [ notcompute, networks ]} ]}]} + - {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [ undercloud, networks ]} ]}]} - ":8000/v1/waitcondition" os-collect-config: cfn: access_key_id: Ref: Key - path: notcomputeConfig.Metadata + path: undercloudConfig.Metadata secret_access_key: Fn::GetAtt: - Key @@ -150,7 +150,7 @@ Resources: rabbit: host: 127.0.0.1 password: guest - notcompute: + undercloud: Type: OS::Nova::Server Properties: image: @@ -164,7 +164,7 @@ Resources: cfn: access_key_id: Ref: Key - path: notcomputeConfig.Metadata + path: undercloudConfig.Metadata secret_access_key: Fn::GetAtt: - Key |