aboutsummaryrefslogtreecommitdiffstats
path: root/nova-compute-instance.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-08-12 12:12:43 +0000
committerGerrit Code Review <review@openstack.org>2014-08-12 12:12:43 +0000
commit0d5526d4a96ba21c742c4b3055e7d3a672c47eeb (patch)
tree95cf8640f376d9e2e371e1c9373193e0998cf160 /nova-compute-instance.yaml
parent06fcc32314786feaccae5f67c8fa5940e6dabafe (diff)
parent044a5c111ed4fae16673e352d696c152c608f245 (diff)
Merge "Restore rabbit.host and add an haproxy rabbit listener"
Diffstat (limited to 'nova-compute-instance.yaml')
-rw-r--r--nova-compute-instance.yaml3
1 files changed, 3 insertions, 0 deletions
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}