summaryrefslogtreecommitdiffstats
path: root/overcloud-source.yaml
diff options
context:
space:
mode:
authorJan Provaznik <jprovazn@redhat.com>2014-06-09 03:36:24 -0400
committerJan Provaznik <jprovazn@redhat.com>2014-07-01 16:08:37 +0200
commit306841c7f2bce5ce8da4dcfa6f127abfa9a6283b (patch)
treed5ce1e145820abb208d4798881c7942b8063c040 /overcloud-source.yaml
parent19271ebcd290997b99647da1e1e27ac21633aea4 (diff)
Enable multi-node rabbitmq cluster
This causes that: * rabbit.nodes is list of all control nodes * rabbit_hosts in OS config files points to all nodes in rabbitmq cluster * overcloud control nodes are joined into cluster This works both for single or multiple control nodes and it's needed for scaling out control nodes. rabbit.nodes property is very similar to generating list of all hosts, so it uses same StructuredConfig block. This block (and couple of references) is renamed to allNodesConfig to make it more general. Related to blueprint tripleo-icehouse-ha-production-configuration Change-Id: Ice1a34ba7a52c41c1bb0c63350438971c651e7b6
Diffstat (limited to 'overcloud-source.yaml')
-rw-r--r--overcloud-source.yaml22
1 files changed, 13 insertions, 9 deletions
diff --git a/overcloud-source.yaml b/overcloud-source.yaml
index 02ecdfa1..70c8f7d7 100644
--- a/overcloud-source.yaml
+++ b/overcloud-source.yaml
@@ -286,7 +286,6 @@ Resources:
Parameters:
NovaApiHost: {'Fn::Select': [ip_address, 'Fn::Select': [0, 'Fn::GetAtt': [ControlVirtualIP, fixed_ips]]]}
KeystoneHost: {'Fn::Select': [ip_address, 'Fn::Select': [0, 'Fn::GetAtt': [ControlVirtualIP, fixed_ips]]]}
- RabbitHost: {'Fn::Select': [ip_address, 'Fn::Select': [0, 'Fn::GetAtt': [ControlVirtualIP, fixed_ips]]]}
NeutronHost: {'Fn::Select': [ip_address, 'Fn::Select': [0, 'Fn::GetAtt': [ControlVirtualIP, fixed_ips]]]}
GlanceHost: {'Fn::Select': [ip_address, 'Fn::Select': [0, 'Fn::GetAtt': [ControlVirtualIP, fixed_ips]]]}
NovaDSN: {"Fn::Join": ['', ['mysql://nova:unset@', {'Fn::Select': [ip_address, 'Fn::Select': [0, 'Fn::GetAtt': [ControlVirtualIP, fixed_ips]]]}, '/nova']]}
@@ -303,12 +302,12 @@ Resources:
Ref: HypervisorNeutronPublicInterface
NeutronBridgeMappings:
Ref: NeutronBridgeMappings
- NovaCompute0Hosts:
+ NovaCompute0AllNodes:
Type: FileInclude
Path: nova-compute-instance.yaml
- SubKey: Resources.NovaCompute0HostsDeploy
+ SubKey: Resources.NovaCompute0AllNodesDeploy
Parameters:
- HostsConfig: {Ref: allHostsConfig}
+ AllNodesConfig: {Ref: allNodesConfig}
NovaCompute0Passthrough:
Type: OS::Heat::StructuredDeployment
Properties:
@@ -442,8 +441,6 @@ Resources:
service-password:
Ref: NovaPassword
rabbit:
- host:
- get_input: controller_host
username:
Ref: RabbitUserName
password:
@@ -481,10 +478,10 @@ Resources:
key_name:
Ref: KeyName
user_data_format: SOFTWARE_CONFIG
- controller0Hosts:
+ controller0AllNodesConfig:
Type: OS::Heat::StructuredDeployment
Properties:
- config: {Ref: allHostsConfig}
+ config: {Ref: allNodesConfig}
server: {Ref: controller0}
signal_transport: NO_SIGNAL
controller0Deployment:
@@ -527,7 +524,7 @@ Resources:
- - 'http://'
- {'Fn::Select': [ip_address, 'Fn::Select': [0, 'Fn::GetAtt': [ControlVirtualIP, fixed_ips]]]}
- ':8000/v1/waitcondition'
- allHostsConfig:
+ allNodesConfig:
Type: OS::Heat::StructuredConfig
Properties:
config:
@@ -587,6 +584,13 @@ Resources:
- show
- 'novalocal'
- {Ref: CloudName}
+ rabbit:
+ nodes:
+ Fn::Join:
+ - ','
+ - Merge::Map:
+ controller0:
+ {"Fn::Select": [ name, {"Fn::GetAtt": [controller0, show]} ] }
controller0SSLDeployment:
Type: OS::Heat::StructuredDeployment
Properties: