summaryrefslogtreecommitdiffstats
path: root/overcloud-source.yaml
diff options
context:
space:
mode:
authorGiulio Fidente <gfidente@redhat.com>2014-08-04 21:02:18 +0200
committerGiulio Fidente <gfidente@redhat.com>2014-08-08 14:21:45 +0200
commit044a5c111ed4fae16673e352d696c152c608f245 (patch)
treee354521acafa2655e4fd1a01f54562519bc7fd1a /overcloud-source.yaml
parenta533b3aecebe86e6f22e690d896856bfb606663b (diff)
Restore rabbit.host and add an haproxy rabbit listener
To balance load over the rabbit cluster we want to route access to it via haproxy. This also helps workaround bug #856764 as an additional benefit. This change sets rabbit.host to the ControlVirtualIP (to be used by the elements) and adds an haproxy listener for the rabbit nodes. Related to blueprint tripleo-icehouse-ha-production-configuration Depends on I3ff37ec18b9191ca8e861519bed142cbdbd5faa2 Change-Id: I49b622a604542f456bd9a37da8dae3353218e640 Related-Bug: 856764
Diffstat (limited to 'overcloud-source.yaml')
-rw-r--r--overcloud-source.yaml7
1 files changed, 7 insertions, 0 deletions
diff --git a/overcloud-source.yaml b/overcloud-source.yaml
index d6f7eb34..51d3bb4b 100644
--- a/overcloud-source.yaml
+++ b/overcloud-source.yaml
@@ -321,6 +321,7 @@ resources:
KeystoneHost: {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]}
NeutronHost: {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]}
GlanceHost: {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]}
+ RabbitHost: {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]}
NovaDSN: {list_join: ['', ['mysql://nova:unset@', {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]}, '/nova']]}
CeilometerDSN: {list_join: ['', ['mysql://ceilometer:unset@', {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]}, '/ceilometer']]}
NeutronDSN: {list_join: ['', ['mysql://neutron:unset@', {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]}, '/ovs_neutron']]}
@@ -487,6 +488,7 @@ resources:
service-password:
get_param: NovaPassword
rabbit:
+ host: {get_input: controller_virtual_ip}
username:
get_param: RabbitUserName
password:
@@ -591,6 +593,11 @@ resources:
- name: swift_proxy_server
port: 8080
net_binds: *public_binds
+ - name: rabbitmq
+ port: 5672
+ options:
+ - timeout client 0
+ - timeout server 0
controllerPassthrough:
type: OS::Heat::StructuredConfig
properties: