diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2014-08-12 12:12:43 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2014-08-12 12:12:43 +0000 |
| commit | 0d5526d4a96ba21c742c4b3055e7d3a672c47eeb (patch) | |
| tree | 95cf8640f376d9e2e371e1c9373193e0998cf160 | |
| parent | 06fcc32314786feaccae5f67c8fa5940e6dabafe (diff) | |
| parent | 044a5c111ed4fae16673e352d696c152c608f245 (diff) | |
Merge "Restore rabbit.host and add an haproxy rabbit listener"
| -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 fcfb821f..6449f8df 100644 --- a/overcloud-source.yaml +++ b/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: |