openstack
/
kolla-ansible
Code Issues Proposed changes

Merge "Neutron oslo_messaging_notifications config error"

This commit is contained in:
Jenkins 2017-06-12 07:07:12 +00:00 committed by Gerrit Code Review
parent cd762e8efb e624f216a8
commit 53a4f23469
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ansible/roles/neutron/defaults/main.yml
View File

@ -281,3 +281,14 @@ service_plugins:
enabled: "{{ enable_neutron_bgp_dragent | bool }}"
neutron_service_plugins: "{{ service_plugins|selectattr('enabled', 'equalto', true)|list }}"
####################
# Notification
####################
neutron_notification_topics:
- name: notifications
enabled: "{{ enable_ceilometer | bool or enable_searchlight | bool }}"
- name: notifications_designate
enabled: "{{ enable_designate | bool }}"
neutron_enabled_notification_topics: "{{ neutron_notification_topics | selectattr('enabled', 'equalto', true) | list }}"

5
ansible/roles/neutron/templates/neutron.conf.j2
View File

@ -96,10 +96,9 @@ memcached_servers = {% for host in groups['memcached'] %}{% if orchestration_eng
{% endif %}
[oslo_messaging_notifications]
{% if enable_ceilometer | bool or enable_searchlight | bool or enable_designate | bool %}
{% if neutron_enabled_notification_topics %}
driver = messagingv2
{% set topics=["notifications" if enable_ceilometer | bool else "", "notifications_designate" if enable_designate | bool else ""] %}
topics = {{ topics|reject("equalto", "")|list|join(",") }}
topics = {{ neutron_enabled_notification_topics | map(attribute='name') | join(',') }}
{% else %}
driver = noop
{% endif %}