diff options
author | Dan Prince <dprince@redhat.com> | 2014-03-31 14:12:49 -0400 |
---|---|---|
committer | Dan Prince <dprince@redhat.com> | 2014-04-09 13:26:41 -0400 |
commit | 0223d35c0cfe810a47a22df0a6aa5c858ccba335 (patch) | |
tree | 68d6d35cbfe3ba0b9882f2913d8a403f1c4842d1 /block-storage.yaml | |
parent | 101e7e9be48e62f31b876a0d657b2c2ea27a565b (diff) |
Stop using notCompute in favor of controller
Updates all references for notCompute and notcompute
to use 'controller' instead.
Change-Id: I70ef83f35064ab388bdc7e1a6da62b6585580010
Partial-bug: #1300324
Diffstat (limited to 'block-storage.yaml')
-rw-r--r-- | block-storage.yaml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/block-storage.yaml b/block-storage.yaml index 312ce95b..c437aa69 100644 --- a/block-storage.yaml +++ b/block-storage.yaml @@ -32,7 +32,7 @@ Resources: Ref: BlockStorageUser BlockStorage0CompletionCondition: Type: AWS::CloudFormation::WaitCondition - DependsOn: notCompute0Config + DependsOn: controller0Config Properties: Handle: {Ref: BlockStorage0CompletionHandle} Count: '1' @@ -74,9 +74,9 @@ Resources: path: BlockStorage0Config.Metadata admin-password: {Ref: AdminPassword} keystone: - host: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [notCompute0, networks]} ]} ] } + host: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [controller0, networks]} ]} ] } cinder: - db: {"Fn::Join": ['', ['mysql://cinder:unset@', {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [notCompute0, networks]} ]} ] } , '/cinder']]} + db: {"Fn::Join": ['', ['mysql://cinder:unset@', {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [controller0, networks]} ]} ] } , '/cinder']]} volume_size_mb: '5000' service-password: Ref: CinderPassword @@ -84,7 +84,7 @@ Resources: Ref: CinderISCSIHelper admin-password: {Ref: AdminPassword} rabbit: - host: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [notCompute0, networks]} ]} ] } + host: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [controller0, networks]} ]} ] } username: {Ref: RabbitUserName} password: {Ref: RabbitPassword} interfaces: |