Merge "Restore rabbit.host and add an haproxy rabbit listener"

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:

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}

overcloud-source.yaml

@@ -317,6 +317,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']]}
@@ -494,6 +495,7 @@ resources:
           service-password:
             get_param: NovaPassword
         rabbit:
+          host: {get_input: controller_virtual_ip}
           username:
             get_param: RabbitUserName
           password:
@@ -598,6 +600,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: