diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-06-12 07:07:12 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-06-12 07:07:12 +0000 |
| commit | 53a4f234697b7ad01a64ddb8c885ca5fbb878562 (patch) | |
| tree | 66f586ebfa33e383abd200218bbe9de3cce2036c | |
| parent | cd762e8efb880164a951d00945442514e713b221 (diff) | |
| parent | e624f216a840734c62a472c7df2b6c1b43acb8ef (diff) | |
| download | kolla-ansible-53a4f234697b7ad01a64ddb8c885ca5fbb878562.tar.gz kolla-ansible-53a4f234697b7ad01a64ddb8c885ca5fbb878562.zip | |
Merge "Neutron oslo_messaging_notifications config error"
| -rw-r--r-- | ansible/roles/neutron/defaults/main.yml | 11 | ||||
| -rw-r--r-- | ansible/roles/neutron/templates/neutron.conf.j2 | 5 |
2 files changed, 13 insertions, 3 deletions
diff --git a/ansible/roles/neutron/defaults/main.yml b/ansible/roles/neutron/defaults/main.yml index 0cbba8535..899049841 100644 --- a/ansible/roles/neutron/defaults/main.yml +++ b/ansible/roles/neutron/defaults/main.yml @@ -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 }}" diff --git a/ansible/roles/neutron/templates/neutron.conf.j2 b/ansible/roles/neutron/templates/neutron.conf.j2 index e16c166ea..2980f3c41 100644 --- a/ansible/roles/neutron/templates/neutron.conf.j2 +++ b/ansible/roles/neutron/templates/neutron.conf.j2 @@ -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 %} |