openstack/openstack-ansible-os_neutron
Code Issues Proposed changes

Merge "Rely on namespaced vars for rabbitmq"

Browse Source
This commit is contained in:
Jenkins 2016-07-12 15:17:14 +00:00 committed by Gerrit Code Review
commit 987ad86504
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
templates/neutron.conf.j2
View File

@ -180,12 +180,12 @@ root_helper = sudo {{ neutron_bin }}/neutron-rootwrap /etc/neutron/rootwrap.conf
# Messaging service # Messaging service
[oslo_messaging_rabbit] [oslo_messaging_rabbit]
rabbit_port = {{ rabbitmq_port }} rabbit_port = {{ neutron_rabbitmq_port }}
rabbit_userid = {{ neutron_rabbitmq_userid }} rabbit_userid = {{ neutron_rabbitmq_userid }}
rabbit_password = {{ neutron_rabbitmq_password }} rabbit_password = {{ neutron_rabbitmq_password }}
rabbit_virtual_host = {{ neutron_rabbitmq_vhost }} rabbit_virtual_host = {{ neutron_rabbitmq_vhost }}
rabbit_hosts = {{ rabbitmq_servers }} rabbit_hosts = {{ neutron_rabbitmq_servers }}
rabbit_use_ssl = {{ rabbitmq_use_ssl }} rabbit_use_ssl = {{ neutron_rabbitmq_use_ssl }}
# Concurrency (locking mechanisms) # Concurrency (locking mechanisms)
[oslo_concurrency] [oslo_concurrency]

3
tests/test-vars.yml
View File

@ -43,6 +43,9 @@ neutron_provider_networks:
neutron_rabbitmq_password: secrete neutron_rabbitmq_password: secrete
neutron_rabbitmq_userid: neutron neutron_rabbitmq_userid: neutron
neutron_rabbitmq_vhost: /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_requirements_git_install_branch: master
neutron_service_password: secrete neutron_service_password: secrete
neutron_venv_tag: testing neutron_venv_tag: testing