From 044a5c111ed4fae16673e352d696c152c608f245 Mon Sep 17 00:00:00 2001
From: Giulio Fidente <gfidente@redhat.com>
Date: Mon, 4 Aug 2014 21:02:18 +0200
Subject: [PATCH] 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
---
 nova-compute-config.yaml   | 1 +
 nova-compute-instance.yaml | 3 +++
 overcloud-source.yaml      | 7 +++++++
 3 files changed, 11 insertions(+)

diff --git a/nova-compute-config.yaml b/nova-compute-config.yaml
index ef440a3dfc..cb428ea614 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 597b42b265..562d0ad1f2 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 d6f7eb34a0..51d3bb4b87 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: