summaryrefslogtreecommitdiff
path: root/openstack/etc/neutron
diff options
context:
space:
mode:
authorFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2014-12-09 17:50:59 +0000
committerFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2015-01-22 12:46:27 +0000
commit29c6d987edd97ce6e42d4b3ef4c69001e8ee901e (patch)
tree9adccd8dce70feacd18defab3eb0e6238228f795 /openstack/etc/neutron
parentcebff6e73a3981f62b4593a3421ec65ffa482449 (diff)
downloaddefinitions-29c6d987edd97ce6e42d4b3ef4c69001e8ee901e.tar.gz
FIXUPME: Fix rabbit variable-strings in neutron conf
Diffstat (limited to 'openstack/etc/neutron')
-rw-r--r--openstack/etc/neutron/neutron.conf10
1 files changed, 5 insertions, 5 deletions
diff --git a/openstack/etc/neutron/neutron.conf b/openstack/etc/neutron/neutron.conf
index 69f36fdd..38f0e44e 100644
--- a/openstack/etc/neutron/neutron.conf
+++ b/openstack/etc/neutron/neutron.conf
@@ -343,23 +343,23 @@ nova_admin_auth_url = ##KEYSTONE_ADMIN_URL##
# The RabbitMQ broker address where a single node is used.
# (string value)
-rabbit_host=##RABBIT_HOST##
+rabbit_host=##RABBITMQ_HOST##
# The RabbitMQ broker port where a single node is used.
# (integer value)
-rabbit_port=##RABBIT_PORT##
+rabbit_port=##RABBITMQ_PORT##
# RabbitMQ HA cluster host:port pairs. (list value)
-rabbit_hosts=$rabbit_host:$rabbit_port
+#rabbit_hosts=$rabbit_host:$rabbit_port
# Connect over SSL for RabbitMQ. (boolean value)
#rabbit_use_ssl=false
# The RabbitMQ userid. (string value)
-rabbit_userid=##RABBIT_USER##
+rabbit_userid=##RABBITMQ_USER##
# The RabbitMQ password. (string value)
-rabbit_password=##RABBIT_PASSWORD##
+rabbit_password=##RABBITMQ_PASSWORD##
# the RabbitMQ login method (string value)
#rabbit_login_method=AMQPLAIN