aboutsummaryrefslogtreecommitdiffstats
path: root/undercloud-source.yaml
diff options
context:
space:
mode:
authorDan Prince <dprince@redhat.com>2014-03-31 14:12:49 -0400
committerDan Prince <dprince@redhat.com>2014-04-09 13:26:41 -0400
commit0223d35c0cfe810a47a22df0a6aa5c858ccba335 (patch)
tree68d6d35cbfe3ba0b9882f2913d8a403f1c4842d1 /undercloud-source.yaml
parent101e7e9be48e62f31b876a0d657b2c2ea27a565b (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 '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 39cc4252..27d13ad7 100644
--- a/undercloud-source.yaml
+++ b/undercloud-source.yaml
@@ -93,19 +93,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:
@@ -137,7 +137,7 @@ Resources:
db: mysql://cinder:unset@localhost/cinder
volume_size_mb: '5000'
completion-handle:
- Ref: notCompute0CompletionHandle
+ Ref: controller0CompletionHandle
db-password: unset
glance:
backend: file
@@ -196,11 +196,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
@@ -248,11 +248,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