summaryrefslogtreecommitdiffstats
path: root/overcloud-source.yaml
diff options
context:
space:
mode:
authorRobert Collins <rbtcollins@hp.com>2014-01-29 13:29:49 +1300
committerRobert Collins <rbtcollins@hp.com>2014-01-31 11:23:03 +1300
commit4aff0fb3f718ee0e55f39f5d0663feb22a14e9a3 (patch)
tree558a6b51b880e18543bf6ad8a46d7d1d02e243d7 /overcloud-source.yaml
parent9ffb18af9421070fffb9375f1fc5e4c94ede0fde (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 'overcloud-source.yaml')
-rw-r--r--overcloud-source.yaml70
1 files changed, 35 insertions, 35 deletions
diff --git a/overcloud-source.yaml b/overcloud-source.yaml
index 6192cc1a..78ce4aa0 100644
--- a/overcloud-source.yaml
+++ b/overcloud-source.yaml
@@ -107,8 +107,8 @@ Resources:
AccessPolicy:
Properties:
AllowedResources:
- - notcompute
- - notcomputeConfig
+ - notCompute0
+ - notCompute0Config
Type: OS::Heat::AccessPolicy
ComputeAccessPolicy:
Properties:
@@ -116,19 +116,19 @@ Resources:
- NovaCompute0
- NovaCompute0Config
Type: OS::Heat::AccessPolicy
- Key:
+ notCompute0Key:
Properties:
UserName:
Ref: User
Type: AWS::IAM::AccessKey
- CompletionCondition:
+ notCompute0CompletionCondition:
Type: AWS::CloudFormation::WaitCondition
- DependsOn: notcompute
+ DependsOn: notCompute0
Properties:
- Handle: {Ref: CompletionHandle}
+ Handle: {Ref: notCompute0CompletionHandle}
Count: '1'
Timeout: '1800'
- CompletionHandle:
+ notCompute0CompletionHandle:
Type: OS::Heat::UpdateWaitConditionHandle
NovaCompute0Key:
Type: FileInclude
@@ -152,14 +152,14 @@ Resources:
Path: nova-compute-instance.yaml
SubKey: Resources.NovaCompute0Config
Parameters:
- NovaApiHost: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [notcompute, networks]} ]} ] }
- KeystoneHost: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [notcompute, networks]} ]} ] }
- RabbitHost: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [notcompute, networks]} ]} ] }
- NeutronHost: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [notcompute, networks]} ]} ] }
- GlanceHost: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [notcompute, networks]} ]} ] }
- NovaDSN: {"Fn::Join": ['', ['mysql://nova:unset@', {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [notcompute, networks]} ]} ]}, '/nova']]}
- CeilometerDSN: {"Fn::Join": ['', ['mysql://ceilometer:unset@', {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [notcompute, networks]} ]} ]}, '/ceilometer']]}
- NeutronDSN: {"Fn::Join": ['', ['mysql://neutron:unset@', {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [notcompute, networks]} ]} ]}, '/neutron']]}
+ NovaApiHost: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [notCompute0, networks]} ]} ] }
+ KeystoneHost: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [notCompute0, networks]} ]} ] }
+ RabbitHost: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [notCompute0, networks]} ]} ] }
+ NeutronHost: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [notCompute0, networks]} ]} ] }
+ GlanceHost: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [notCompute0, networks]} ]} ] }
+ NovaDSN: {"Fn::Join": ['', ['mysql://nova:unset@', {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [notCompute0, networks]} ]} ]}, '/nova']]}
+ CeilometerDSN: {"Fn::Join": ['', ['mysql://ceilometer:unset@', {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [notCompute0, networks]} ]} ]}, '/ceilometer']]}
+ NeutronDSN: {"Fn::Join": ['', ['mysql://neutron:unset@', {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [notCompute0, networks]} ]} ]}, '/neutron']]}
NeutronNetworkType: "gre"
NeutronEnableTunnelling: "True"
NeutronNetworkVLANRanges: ""
@@ -175,7 +175,7 @@ Resources:
Policies:
- Ref: AccessPolicy
Type: AWS::IAM::User
- notcomputeConfig:
+ notCompute0Config:
Type: AWS::AutoScaling::LaunchConfiguration
Properties:
ImageId: '0'
@@ -200,14 +200,14 @@ Resources:
service-password:
Ref: CinderPassword
completion-handle:
- Ref: CompletionHandle
+ Ref: notCompute0CompletionHandle
controller-address:
Fn::Select:
- 0
- Fn::Select:
- 'ctlplane'
- Fn::GetAtt:
- - notcompute
+ - notCompute0
- networks
db-password: unset
glance:
@@ -219,7 +219,7 @@ Resources:
- Fn::Select:
- 'ctlplane'
- Fn::GetAtt:
- - notcompute
+ - notCompute0
- networks
service-password:
Ref: GlancePassword
@@ -242,7 +242,7 @@ Resources:
- Fn::Select:
- 'ctlplane'
- Fn::GetAtt:
- - notcompute
+ - notCompute0
- networks
- ':8003'
metadata_server_url:
@@ -254,7 +254,7 @@ Resources:
- Fn::Select:
- 'ctlplane'
- Fn::GetAtt:
- - notcompute
+ - notCompute0
- networks
- ':8000'
waitcondition_server_url:
@@ -266,7 +266,7 @@ Resources:
- Fn::Select:
- 'ctlplane'
- Fn::GetAtt:
- - notcompute
+ - notCompute0
- networks
- ':8000/v1/waitcondition'
keystone:
@@ -277,7 +277,7 @@ Resources:
- Fn::Select:
- 'ctlplane'
- Fn::GetAtt:
- - notcompute
+ - notCompute0
- networks
neutron:
host:
@@ -286,7 +286,7 @@ Resources:
- Fn::Select:
- ctlplane
- Fn::GetAtt:
- - notcompute
+ - notCompute0
- networks
metadata_proxy_shared_secret: unset
ovs:
@@ -297,7 +297,7 @@ Resources:
- Fn::Select:
- ctlplane
- Fn::GetAtt:
- - notcompute
+ - notCompute0
- networks
bridge_mappings: {Ref: NeutronBridgeMappings}
public_interface:
@@ -327,7 +327,7 @@ Resources:
- Fn::Select:
- 'ctlplane'
- Fn::GetAtt:
- - notcompute
+ - notCompute0
- networks
metadata-proxy: true
service-password:
@@ -335,11 +335,11 @@ Resources:
os-collect-config:
cfn:
access_key_id:
- Ref: Key
- path: notcomputeConfig.Metadata
+ Ref: notCompute0Key
+ path: notCompute0Config.Metadata
secret_access_key:
Fn::GetAtt:
- - Key
+ - notCompute0Key
- SecretAccessKey
stack_name:
Ref: AWS::StackName
@@ -350,13 +350,13 @@ Resources:
- Fn::Select:
- ctlplane
- Fn::GetAtt:
- - notcompute
+ - notCompute0
- networks
password: guest
ntp:
servers:
- {server: {Ref: NtpServer}, fudge: "stratum 0"}
- notcompute:
+ notCompute0:
Type: OS::Nova::Server
Properties:
image:
@@ -371,11 +371,11 @@ Resources:
os-collect-config:
cfn:
access_key_id:
- Ref: Key
- path: notcomputeConfig.Metadata
+ Ref: notCompute0Key
+ path: notCompute0Config.Metadata
secret_access_key:
Fn::GetAtt:
- - Key
+ - notCompute0Key
- SecretAccessKey
stack_name:
Ref: AWS::StackName
@@ -391,6 +391,6 @@ Outputs:
- Fn::Select:
- ctlplane
- Fn::GetAtt:
- - notcompute
+ - notCompute0
- networks
- :5000/v2.0/