openstack
/
openstack-ansible-os_neutron
Code Issues Proposed changes

Merge "Update messaging notification configuration"

This commit is contained in:
Zuul 2018-12-11 14:28:56 +00:00 committed by Gerrit Code Review
parent ed75e869a0 83f815e072
commit ee5f750859
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tasks/main.yml
View File

@ -137,7 +137,6 @@
_oslomsg_notify_password: "{{ neutron_oslomsg_notify_password }}"
_oslomsg_notify_vhost: "{{ neutron_oslomsg_notify_vhost }}"
_oslomsg_notify_transport: "{{ neutron_oslomsg_notify_transport }}"
_oslomsg_configure_notify: "{{ (neutron_ceilometer_enabled | bool) or (neutron_designate_enabled | bool) }}"
tags:
- common-mq
- neutron-config

9
templates/neutron.conf.j2
View File

@ -249,19 +249,14 @@ ssl = {{ neutron_oslomsg_rpc_use_ssl }}
rpc_conn_pool_size = {{ neutron_rpc_conn_pool_size }}
# Notifications
{% if neutron_ceilometer_enabled or neutron_designate_enabled %}
[oslo_messaging_notifications]
{% set notification_topics = [] %}
{% if neutron_ceilometer_enabled %}
{% set _ = notification_topics.append('notifications') %}
{% endif %}
{% set notification_topics = ['notifications'] %}
{% if neutron_designate_enabled %}
{% set _ = notification_topics.append(neutron_notifications_designate) %}
{% endif %}
notification_topics = {{ notification_topics | join(',') }}
topics = {{ notification_topics | join(',') }}
driver = messagingv2
transport_url = {{ neutron_oslomsg_notify_transport }}://{% for host in neutron_oslomsg_notify_servers.split(',') %}{{ neutron_oslomsg_notify_userid }}:{{ neutron_oslomsg_notify_password }}@{{ host }}:{{ neutron_oslomsg_notify_port }}{% if not loop.last %},{% else %}/{{ neutron_oslomsg_notify_vhost }}{% if neutron_oslomsg_notify_use_ssl | bool %}?ssl=1{% else %}?ssl=0{% endif %}{% endif %}{% endfor %}
{% endif %}
# Concurrency (locking mechanisms)
[oslo_concurrency]