From 0223d35c0cfe810a47a22df0a6aa5c858ccba335 Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Mon, 31 Mar 2014 14:12:49 -0400 Subject: Stop using notCompute in favor of controller Updates all references for notCompute and notcompute to use 'controller' instead. Change-Id: I70ef83f35064ab388bdc7e1a6da62b6585580010 Partial-bug: #1300324 --- block-storage-nfs.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'block-storage-nfs.yaml') diff --git a/block-storage-nfs.yaml b/block-storage-nfs.yaml index d00484b9..c1653837 100644 --- a/block-storage-nfs.yaml +++ b/block-storage-nfs.yaml @@ -25,7 +25,7 @@ Resources: Ref: BlockStorageUser BlockStorage0CompletionCondition: Type: AWS::CloudFormation::WaitCondition - DependsOn: notCompute0Config + DependsOn: controller0Config Properties: Handle: {Ref: BlockStorage0CompletionHandle} Count: '1' @@ -51,18 +51,18 @@ Resources: stack_name: {Ref: 'AWS::StackName'} OpenStack::ImageBuilder::Elements: [ cinder ] 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 include_nfs_backend: 'true' nfs_shares: - - {"Fn::Join": ['', [{"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [notCompute0, networks]} ]} ] } , ':/mnt/state/var/lib/nfs_share']]} + - {"Fn::Join": ['', [{"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [controller0, networks]} ]} ] } , ':/mnt/state/var/lib/nfs_share']]} 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: -- cgit 1.2.3-korg