openstack/openstack-ansible-os_neutron
Code Issues Proposed changes

Merge "Allow configuration of multiple rabbit clusters"

Browse Source
This commit is contained in:
Jenkins 2016-07-22 10:30:16 +00:00 committed by Gerrit Code Review
commit fe7f91c8b0
3 changed files with 29 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
defaults/main.yml
View File

@ -70,8 +70,20 @@ neutron_db_pool_size: 120
neutron_db_pool_timeout: 30 neutron_db_pool_timeout: 30
## RabbitMQ info ## RabbitMQ info
## Configuration for RPC communications
neutron_rabbitmq_userid: neutron neutron_rabbitmq_userid: neutron
neutron_rabbitmq_vhost: /neutron neutron_rabbitmq_vhost: /neutron
neutron_rabbitmq_port: 5672
neutron_rabbitmq_servers: 127.0.0.1
neutron_rabbitmq_use_ssl: False
## Configuration for notifications communication, i.e. [oslo_messaging_notifications]
neutron_rabbitmq_telemetry_userid: "{{ neutron_rabbitmq_userid }}"
neutron_rabbitmq_telemetry_vhost: "{{ neutron_rabbitmq_vhost }}"
neutron_rabbitmq_telemetry_port: "{{ neutron_rabbitmq_port }}"
neutron_rabbitmq_telemetry_servers: "{{ neutron_rabbitmq_servers }}"
neutron_rabbitmq_telemetry_use_ssl: "{{ neutron_rabbitmq_use_ssl }}"
## Plugins ## Plugins
neutron_plugin_core: "{{ neutron_plugins[neutron_plugin_type].plugin_core }}" neutron_plugin_core: "{{ neutron_plugins[neutron_plugin_type].plugin_core }}"

19
templates/neutron.conf.j2
View File

@ -32,9 +32,6 @@ auth_strategy = keystone
network_scheduler_driver = {{ neutron_driver_network_scheduler }} network_scheduler_driver = {{ neutron_driver_network_scheduler }}
router_scheduler_driver = {{ neutron_driver_router_scheduler }} router_scheduler_driver = {{ neutron_driver_router_scheduler }}
loadbalancer_pool_scheduler_driver = {{ neutron_driver_loadbalancer_pool_scheduler }} loadbalancer_pool_scheduler_driver = {{ neutron_driver_loadbalancer_pool_scheduler }}
{% if neutron_ceilometer_enabled %}
notification_driver = messagingv2
{% endif %}
# Schedulers # Schedulers
network_auto_schedule = True network_auto_schedule = True
@ -89,6 +86,7 @@ rpc_backend = {{ neutron_rpc_backend }}
executor_thread_pool_size = {{ neutron_rpc_thread_pool_size }} executor_thread_pool_size = {{ neutron_rpc_thread_pool_size }}
rpc_conn_pool_size = {{ neutron_rpc_conn_pool_size }} rpc_conn_pool_size = {{ neutron_rpc_conn_pool_size }}
rpc_response_timeout = {{ neutron_rpc_response_timeout }} rpc_response_timeout = {{ neutron_rpc_response_timeout }}
transport_url = rabbit://{% for host in neutron_rabbitmq_servers.split(',') %}{{ neutron_rabbitmq_userid }}:{{ neutron_rabbitmq_password }}@{{ host }}:{{ neutron_rabbitmq_port }}/{{ neutron_rabbitmq_vhost }}?rabbit_use_ssl={{ neutron_rabbitmq_use_ssl }},{% endfor %}
[nova] [nova]
auth_plugin = {{ nova_keystone_auth_plugin }} auth_plugin = {{ nova_keystone_auth_plugin }}
@ -176,14 +174,15 @@ polling_interval = {{ neutron_agent_polling_interval|default(5) }}
report_interval = {{ neutron_report_interval|int }} report_interval = {{ neutron_report_interval|int }}
root_helper = sudo {{ neutron_bin }}/neutron-rootwrap /etc/neutron/rootwrap.conf root_helper = sudo {{ neutron_bin }}/neutron-rootwrap /etc/neutron/rootwrap.conf
# Messaging service # Messaging
[oslo_messaging_rabbit] [oslo_messaging_rabbit]
rabbit_port = {{ neutron_rabbitmq_port }}
rabbit_userid = {{ neutron_rabbitmq_userid }} # Notifications
rabbit_password = {{ neutron_rabbitmq_password }} {% if neutron_ceilometer_enabled %}
rabbit_virtual_host = {{ neutron_rabbitmq_vhost }} [oslo_messaging_notifications]
rabbit_hosts = {{ neutron_rabbitmq_servers }} driver = messagingv2
rabbit_use_ssl = {{ neutron_rabbitmq_use_ssl }} transport_url = rabbit://{% for host in neutron_rabbitmq_telemetry_servers.split(',') %}{{ neutron_rabbitmq_telemetry_userid }}:{{ neutron_rabbitmq_telemetry_password }}@{{ host }}:{{ neutron_rabbitmq_telemetry_port }}/{{ neutron_rabbitmq_telemetry_vhost }}?rabbit_use_ssl={{ neutron_rabbitmq_telemetry_use_ssl }},{% endfor %}
{% endif %}
# Concurrency (locking mechanisms) # Concurrency (locking mechanisms)
[oslo_concurrency] [oslo_concurrency]

16
tests/test-vars.yml
View File

@ -13,9 +13,9 @@ keystone_galera_address: 10.100.100.2
keystone_galera_database: keystone keystone_galera_database: keystone
keystone_git_install_branch: master keystone_git_install_branch: master
keystone_rabbitmq_password: secrete keystone_rabbitmq_password: secrete
keystone_rabbitmq_port: 5671 keystone_rabbitmq_port: "{{ rabbitmq_port }}"
keystone_rabbitmq_servers: 10.100.100.2 keystone_rabbitmq_servers: "{{ rabbitmq_servers }}"
keystone_rabbitmq_use_ssl: false keystone_rabbitmq_use_ssl: "{{ rabbitmq_use_ssl }}"
keystone_rabbitmq_userid: keystone keystone_rabbitmq_userid: keystone
keystone_rabbitmq_vhost: /keystone keystone_rabbitmq_vhost: /keystone
keystone_requirements_git_install_branch: master keystone_requirements_git_install_branch: master
@ -43,9 +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_port: "{{ rabbitmq_port }}"
neutron_rabbitmq_servers: 10.100.100.2 neutron_rabbitmq_servers: "{{ rabbitmq_servers }}"
neutron_rabbitmq_use_ssl: true neutron_rabbitmq_use_ssl: "{{ rabbitmq_use_ssl }}"
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
@ -62,6 +62,6 @@ nova_service_user_name: nova
openrc_os_auth_url: "http://127.0.0.1:5000/v3" openrc_os_auth_url: "http://127.0.0.1:5000/v3"
openrc_os_domain_name: Default openrc_os_domain_name: Default
openrc_os_password: "{{ keystone_auth_admin_password }}" openrc_os_password: "{{ keystone_auth_admin_password }}"
rabbitmq_port: 5671 rabbitmq_port: 5672
rabbitmq_servers: 10.100.100.2 rabbitmq_servers: 10.100.100.2
rabbitmq_use_ssl: true rabbitmq_use_ssl: False