summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-04-14 17:50:36 +0000
committerGerrit Code Review <review@openstack.org>2015-04-14 17:50:36 +0000
commitf9a8502267075d3d61fe471196931ce90c089b61 (patch)
tree2c85f97041f5ba3a956f512aa3f4b96981aca40d
parentbafe58c42d2c0c58346fce929cf443c0436b6cd5 (diff)
parentf1226b2031c6fd5a9320c5764a761683ca0d2ca2 (diff)
Merge "Make rabbitmq bind on ctlplane instead of 0.0.0.0"
-rw-r--r--puppet/controller-puppet.yaml2
1 files changed, 2 insertions, 0 deletions
diff --git a/puppet/controller-puppet.yaml b/puppet/controller-puppet.yaml
index 780c8cfa..78e808c6 100644
--- a/puppet/controller-puppet.yaml
+++ b/puppet/controller-puppet.yaml
@@ -795,7 +795,9 @@ resources:
nova::network::neutron::neutron_admin_password: {get_input: neutron_password}
nova::network::neutron::neutron_url: {get_input: neutron_url}
nova::network::neutron::neutron_admin_auth_url: {get_input: neutron_admin_auth_url}
+
# Rabbit
+ rabbitmq::node_ip_address: {get_input: controller_host}
rabbitmq::erlang_cookie: {get_input: rabbit_cookie}
# Misc