diff options
author | 2014-04-11 18:50:53 +0000 | |
---|---|---|
committer | 2014-04-11 18:50:53 +0000 | |
commit | a830cea3b1071f70485f427877ac4577f5d13e16 (patch) | |
tree | a9d40bdc01fe6eab9e532809bc29c0d7ff1c5cd7 /block-storage.yaml | |
parent | 64a616c4267e663f2a51fcb29117734b2a7af87b (diff) | |
parent | 0223d35c0cfe810a47a22df0a6aa5c858ccba335 (diff) |
Merge "Stop using notCompute in favor of controller"
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: |