diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2014-07-02 18:16:24 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2014-07-02 18:16:24 +0000 |
| commit | 836ccb71847da461bf81fb20ffcac5e3abfd127c (patch) | |
| tree | e76fe948490e0ea210ef5b2029bee60ad59d40a7 /overcloud-source.yaml | |
| parent | 484c0551b2b39fa1932394ca2062ab5a4509194f (diff) | |
| parent | 306841c7f2bce5ce8da4dcfa6f127abfa9a6283b (diff) | |
Merge "Enable multi-node rabbitmq cluster"
Diffstat (limited to 'overcloud-source.yaml')
| -rw-r--r-- | overcloud-source.yaml | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/overcloud-source.yaml b/overcloud-source.yaml index d7d27949..9521983f 100644 --- a/overcloud-source.yaml +++ b/overcloud-source.yaml @@ -290,7 +290,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']]} @@ -307,12 +306,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: @@ -455,8 +454,6 @@ Resources: service-password: Ref: NovaPassword rabbit: - host: - get_input: controller_host username: Ref: RabbitUserName password: @@ -533,10 +530,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: @@ -579,7 +576,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: @@ -639,6 +636,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: |