diff options
author | Robert Collins <rbtcollins@hp.com> | 2014-01-29 13:29:49 +1300 |
---|---|---|
committer | Robert Collins <rbtcollins@hp.com> | 2014-01-31 11:23:03 +1300 |
commit | 4aff0fb3f718ee0e55f39f5d0663feb22a14e9a3 (patch) | |
tree | 558a6b51b880e18543bf6ad8a46d7d1d02e243d7 /undercloud-source.yaml | |
parent | 9ffb18af9421070fffb9375f1fc5e4c94ede0fde (diff) |
Prep work for a scalable control plane.
This is complete as far as it goes but it isn't enough to make running
a scaled out control plane actually work. Specifically, the constructs
to point at API hosts based on looking up a network address aren't
suirtable for scaled out - we need to be using the virtual IP or DNS
round robin or other such resilient configurations, but that is
largely / entirely orthogonal to making the template be ready for
scaling.
Change-Id: Ib9e6db5e7d5db84e4746afdabea046d2b8702bbb
Diffstat (limited to 'undercloud-source.yaml')
-rw-r--r-- | undercloud-source.yaml | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/undercloud-source.yaml b/undercloud-source.yaml index 6431dfd4..801c7916 100644 --- a/undercloud-source.yaml +++ b/undercloud-source.yaml @@ -52,19 +52,19 @@ Resources: AllowedResources: - undercloudConfig Type: OS::Heat::AccessPolicy - Key: + notCompute0Key: Properties: UserName: Ref: User Type: AWS::IAM::AccessKey - CompletionCondition: + notCompute0CompletionCondition: Type: AWS::CloudFormation::WaitCondition DependsOn: undercloud Properties: - Handle: {Ref: CompletionHandle} + Handle: {Ref: notCompute0CompletionHandle} Count: '1' Timeout: '1800' - CompletionHandle: + notCompute0CompletionHandle: Type: AWS::CloudFormation::WaitConditionHandle User: Properties: @@ -96,7 +96,7 @@ Resources: db: mysql://cinder:unset@localhost/cinder volume_size_mb: '5000' completion-handle: - Ref: CompletionHandle + Ref: notCompute0CompletionHandle db-password: unset glance: backend: file @@ -132,11 +132,11 @@ Resources: os-collect-config: cfn: access_key_id: - Ref: Key + Ref: notCompute0Key path: undercloudConfig.Metadata secret_access_key: Fn::GetAtt: - - Key + - notCompute0Key - SecretAccessKey stack_name: Ref: AWS::StackName @@ -174,11 +174,11 @@ Resources: os-collect-config: cfn: access_key_id: - Ref: Key + Ref: notCompute0Key path: undercloudConfig.Metadata secret_access_key: Fn::GetAtt: - - Key + - notCompute0Key - SecretAccessKey stack_name: Ref: AWS::StackName |