openstack/kolla-ansible
Code Issues Proposed changes

Neutron oslo_messaging_notifications config error

Browse Source 
With the following configuration in globals.yml:
enable_ceilometer="no"
enable_designate="no"
enable_searchlight="yes"

neutron.conf is generated like following:

[oslo_messaging_notifications]
driver = messagingv2
topics =

=> topics value is missing.
This patch fix it.

Closes-Bug: #1671940
Change-Id: I28ab60c61882caaba823bab84f30f77e270f29b4
This commit is contained in:
Bertrand Lallau 2017-03-10 22:32:49 +01:00
parent c0df4ab8b6
commit e624f216a8
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

@ -320,3 +320,14 @@ service_plugins:
enabled: "{{ neutron_plugin_agent == 'sfc' }}"
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

@ -97,10 +97,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 %}