Fix oslo notifications configs

- enable glance-registry notifications ( searchlight )
- notification_driver is `noop` by default (means no notifications),
  so we can remove the `else` condition branch.
- this macros >
   {{ oslo_messaging[messaging.backend.notifications]('notifications_config') }}
  should not depend on notifications consumer (searchlight,
  ceilometer, etc), it is just notifications transport backend-related
  config and must be commmon for all.

Change-Id: I16e9d604cb3d69e14d2124fb2ad4f603f86a87aa
This commit is contained in:
Kirill Bespalov 2016-12-29 13:19:44 +03:00
parent 6bc30fc525
commit 94cf47f499
2 changed files with 12 additions and 9 deletions

View File

@ -62,10 +62,9 @@ container_formats = bare
disk_formats = raw
{% endif %}
[oslo_messaging_notifications]
{% if searchlight is defined and searchlight.services.glance %}
driver = {{ searchlight.notification_driver }}
{{ oslo_messaging[messaging.backend.notifications]('notifications_config') }}
{% else %}
driver = noop
{% endif %}
{% if searchlight is defined and searchlight.services.glance -%}
[oslo_messaging_notifications]
driver = {{ searchlight.notification_driver }}
{%- endif %}
{{ oslomsg[messaging.backend.notifications]('notifications_config') }}

View File

@ -26,5 +26,9 @@ memcached_servers = {{ address('memcached', memcached.port) }}
[paste_deploy]
flavor = keystone
[oslo_messaging_notifications]
driver = noop
{% if searchlight is defined and searchlight.services.glance -%}
[oslo_messaging_notifications]
driver = {{ searchlight.notification_driver }}
{%- endif %}
{{ oslomsg[messaging.backend.notifications]('notifications_config') }}