From c2f95902f3ece7666d6eb98bae69fdd091b822c9 Mon Sep 17 00:00:00 2001 From: Travis Truman Date: Fri, 8 Jul 2016 16:33:12 -0400 Subject: [PATCH] Rely on namespaced vars for rabbitmq The namespaced vars already exist and should be used. Further, doing so provides additional deployment flexibility so that we may support multi-RabbitMQ cluster environments. Change-Id: I3a481f523beea3029b392be88199b07d932edef0 --- templates/neutron.conf.j2 | 6 +++--- tests/test-vars.yml | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/templates/neutron.conf.j2 b/templates/neutron.conf.j2 index 985da44b..f67b2eca 100644 --- a/templates/neutron.conf.j2 +++ b/templates/neutron.conf.j2 @@ -180,12 +180,12 @@ root_helper = sudo {{ neutron_bin }}/neutron-rootwrap /etc/neutron/rootwrap.conf # Messaging service [oslo_messaging_rabbit] -rabbit_port = {{ rabbitmq_port }} +rabbit_port = {{ neutron_rabbitmq_port }} rabbit_userid = {{ neutron_rabbitmq_userid }} rabbit_password = {{ neutron_rabbitmq_password }} rabbit_virtual_host = {{ neutron_rabbitmq_vhost }} -rabbit_hosts = {{ rabbitmq_servers }} -rabbit_use_ssl = {{ rabbitmq_use_ssl }} +rabbit_hosts = {{ neutron_rabbitmq_servers }} +rabbit_use_ssl = {{ neutron_rabbitmq_use_ssl }} # Concurrency (locking mechanisms) [oslo_concurrency] diff --git a/tests/test-vars.yml b/tests/test-vars.yml index ce38fd5a..e31c8bef 100644 --- a/tests/test-vars.yml +++ b/tests/test-vars.yml @@ -43,6 +43,9 @@ neutron_provider_networks: neutron_rabbitmq_password: secrete neutron_rabbitmq_userid: neutron neutron_rabbitmq_vhost: /neutron +neutron_rabbitmq_port: 5671 +neutron_rabbitmq_servers: 10.100.100.2 +neutron_rabbitmq_use_ssl: true neutron_requirements_git_install_branch: master neutron_service_password: secrete neutron_venv_tag: testing