openstack
/
salt-formula-neutron
Code Issues Proposed changes

Merge "Support dict values for the notification parameter"

This commit is contained in:
Jenkins 2017-01-04 13:34:59 +00:00 committed by Gerrit Code Review
parent 0b32d2f11a 1c6a0d535d
commit 3e431a62da
3 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
neutron/files/liberty/neutron-server.conf.Debian
View File

@ -570,7 +570,12 @@ rpc_thread_pool_size=70
# Driver or drivers to handle sending notifications. (multi
# valued)
# notification_driver=
{%- if server.notification %}
{%- if server.notification is mapping %}
notification_driver = {{ server.notification.get('driver', 'messagingv2') }}
{%- if server.notification.topics is defined %}
notification_topics = {{ server.notification.topics }}
{%- endif %}
{%- elif server.notification %}
notification_driver = neutron.openstack.common.notifier.rpc_notifier
{%- endif %}
# AMQP topic used for OpenStack notifications. (list value)

7
neutron/files/mitaka/neutron-generic.conf.Debian
View File

@ -1181,7 +1181,12 @@ lock_path = $state_path/lock
# messaging, messagingv2, routing, log, test, noop (multi valued)
# Deprecated group/name - [DEFAULT]/notification_driver
#driver =
{%- if neutron.get('notification', False) %}
{%- if neutron.notification is mapping %}
driver = {{ neutron.notification.get('driver', 'messagingv2') }}
{%- if neutron.notification.topics is defined %}
topics = {{ neutron.notification.topics }}
{%- endif %}
{%- elif neutron.get('notification', False) %}
driver = messagingv2
{%- endif %}

7
neutron/files/mitaka/neutron-server.conf.Debian
View File

@ -1241,7 +1241,12 @@ lock_path = $state_path/lock
# messaging, messagingv2, routing, log, test, noop (multi valued)
# Deprecated group/name - [DEFAULT]/notification_driver
#driver =
{%- if server.notification %}
{%- if server.notification is mapping %}
driver = {{ server.notification.get('driver', 'messagingv2') }}
{%- if server.notification.topics is defined %}
topics = {{ server.notification.topics }}
{%- endif %}
{%- elif server.notification %}
driver = messagingv2
{%- endif %}
# A URL representing the messaging driver to use for notifications. If not set,