aboutsummaryrefslogtreecommitdiffstats
path: root/undercloud-source.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-04-11 18:50:53 +0000
committerGerrit Code Review <review@openstack.org>2014-04-11 18:50:53 +0000
commita830cea3b1071f70485f427877ac4577f5d13e16 (patch)
treea9d40bdc01fe6eab9e532809bc29c0d7ff1c5cd7 /undercloud-source.yaml
parent64a616c4267e663f2a51fcb29117734b2a7af87b (diff)
parent0223d35c0cfe810a47a22df0a6aa5c858ccba335 (diff)
Merge "Stop using notCompute in favor of controller"
Diffstat (limited to 'undercloud-source.yaml')
-rw-r--r--undercloud-source.yaml18
1 files changed, 9 insertions, 9 deletions
diff --git a/undercloud-source.yaml b/undercloud-source.yaml
index 57508fda..c05d5f7d 100644
--- a/undercloud-source.yaml
+++ b/undercloud-source.yaml
@@ -96,19 +96,19 @@ Resources:
AllowedResources:
- undercloudConfig
Type: OS::Heat::AccessPolicy
- notCompute0Key:
+ controller0Key:
Properties:
UserName:
Ref: User
Type: AWS::IAM::AccessKey
- notCompute0CompletionCondition:
+ controller0CompletionCondition:
Type: AWS::CloudFormation::WaitCondition
DependsOn: undercloud
Properties:
- Handle: {Ref: notCompute0CompletionHandle}
+ Handle: {Ref: controller0CompletionHandle}
Count: '1'
Timeout: '1800'
- notCompute0CompletionHandle:
+ controller0CompletionHandle:
Type: AWS::CloudFormation::WaitConditionHandle
User:
Properties:
@@ -140,7 +140,7 @@ Resources:
db: mysql://cinder:unset@localhost/cinder
volume_size_mb: '5000'
completion-handle:
- Ref: notCompute0CompletionHandle
+ Ref: controller0CompletionHandle
db-password: unset
glance:
backend: file
@@ -199,11 +199,11 @@ Resources:
os-collect-config:
cfn:
access_key_id:
- Ref: notCompute0Key
+ Ref: controller0Key
path: undercloudConfig.Metadata
secret_access_key:
Fn::GetAtt:
- - notCompute0Key
+ - controller0Key
- SecretAccessKey
stack_name:
Ref: AWS::StackName
@@ -254,11 +254,11 @@ Resources:
os-collect-config:
cfn:
access_key_id:
- Ref: notCompute0Key
+ Ref: controller0Key
path: undercloudConfig.Metadata
secret_access_key:
Fn::GetAtt:
- - notCompute0Key
+ - controller0Key
- SecretAccessKey
stack_name:
Ref: AWS::StackName