diff options
| author |   Giulio Fidente <gfidente@redhat.com> | 2014-08-04 21:02:18 +0200 |
|---|---|---|
| committer | Giulio Fidente <gfidente@redhat.com> | 2014-08-08 14:21:45 +0200 |
| commit | 044a5c111ed4fae16673e352d696c152c608f245 (patch) | |
| tree | e354521acafa2655e4fd1a01f54562519bc7fd1a | |
| parent | a533b3aecebe86e6f22e690d896856bfb606663b (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
| -rw-r--r-- | nova-compute-config.yaml | 1 | ||||
| -rw-r--r-- | nova-compute-instance.yaml | 3 | ||||
| -rw-r--r-- | overcloud-source.yaml | 7 |
3 files changed, 11 insertions, 0 deletions
diff --git a/nova-compute-config.yaml b/nova-compute-config.yaml index ef440a3d..cb428ea6 100644 --- a/nova-compute-config.yaml +++ b/nova-compute-config.yaml @@ -40,6 +40,7 @@ resources: service-password: {get_input: neutron_password} admin-password: {get_input: admin_password} rabbit: + host: {get_input: rabbit_host} username: {get_input: rabbit_username} password: {get_input: rabbit_password} live-update: diff --git a/nova-compute-instance.yaml b/nova-compute-instance.yaml index 597b42b2..562d0ad1 100644 --- a/nova-compute-instance.yaml +++ b/nova-compute-instance.yaml @@ -77,6 +77,8 @@ parameters: default: '' description: A port to add to the NeutronPhysicalBridge. type: string + RabbitHost: + type: string RabbitUserName: type: string RabbitPassword: @@ -216,6 +218,7 @@ resources: neutron_public_interface: {get_param: NeutronPublicInterface} neutron_password: {get_param: NeutronPassword} admin_password: {get_param: AdminPassword} + rabbit_host: {get_param: RabbitHost} rabbit_username: {get_param: RabbitUserName} rabbit_password: {get_param: RabbitPassword} live_update_host: {get_param: LiveUpdateHost} 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: |