openstack
/
salt-formula-cinder
Code Issues Proposed changes

Merge "Harmonize notification configuration"

This commit is contained in:
Jenkins 2016-12-28 08:22:06 +00:00 committed by Gerrit Code Review
parent 7a694feeda 8bb897e57c
commit c8dfcdcf5d
6 changed files with 34 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cinder/files/liberty/cinder.conf.controller.Debian
View File

@ -60,7 +60,12 @@ control_exchange=cinder
volume_clear={{ controller.wipe_method }}
{%- if controller.notification %}
{%- if controller.notification is mapping %}
notification_driver = {{ controller.notification.get('driver', 'messagingv2') }}
{%- if controller.notification.topics is defined %}
notification_topics = {{ controller.notification.topics }}
{%- endif %}
{%- elif controller.notification %}
control_exchange = cinder
notification_driver = messagingv2
{%- endif %}

14
cinder/files/liberty/cinder.conf.volume.Debian
View File

@ -59,19 +59,13 @@ control_exchange=cinder
volume_clear={{ volume.wipe_method }}
{%- if volume.notification %}
control_exchange = cinder
{%- if volume.notification.driver is defined %}
notification_driver = {{ volume.notification.driver }}
{%- else %}
notification_driver = messagingv2
{%- endif %}
{%- if volume.notification is mapping %}
notification_driver = {{ volume.notification.get('driver', 'messagingv2') }}
{%- if volume.notification.topics is defined %}
notification_topics = {{ volume.notification.topics }}
{%- endif %}
{%- elif volume.notification %}
notification_driver = messagingv2
{%- endif %}
volume_name_template = volume-%s

7
cinder/files/mitaka/cinder.conf.controller.Debian
View File

@ -69,7 +69,12 @@ verbose=True
lock_path=/var/lock/cinder
[oslo_messaging_notifications]
{%- if controller.notification %}
{%- if controller.notification is mapping %}
driver = {{ controller.notification.get('driver', 'messagingv2') }}
{%- if controller.notification.topics is defined %}
topics = {{ controller.notification.topics }}
{%- endif %}
{%- elif controller.notification %}
driver = messagingv2
{%- endif %}

7
cinder/files/mitaka/cinder.conf.volume.Debian
View File

@ -67,7 +67,12 @@ use_syslog=false
verbose=True
[oslo_messaging_notifications]
{%- if volume.notification %}
{%- if volume.notification is mapping %}
driver = {{ volume.notification.get('driver', 'messagingv2') }}
{%- if volume.notification.topics is defined %}
topics = {{ volume.notification.topics }}
{%- endif %}
{%- elif volume.notification %}
driver = messagingv2
{%- endif %}

7
cinder/files/newton/cinder.conf.controller.Debian
View File

@ -74,7 +74,12 @@ nova_catalog_info = compute:nova:publicURL
osapi_volume_extension = cinder.api.contrib.standard_extensions
[oslo_messaging_notifications]
{%- if controller.notification %}
{%- if controller.notification is mapping %}
driver = {{ controller.notification.get('driver', 'messagingv2') }}
{%- if controller.notification.topics is defined %}
topics = {{ controller.notification.topics }}
{%- endif %}
{%- elif controller.notification %}
driver = messagingv2
{%- endif %}

7
cinder/files/newton/cinder.conf.volume.Debian
View File

@ -70,7 +70,12 @@ nova_catalog_admin_info = compute:nova:adminURL
nova_catalog_info = compute:nova:publicURL
[oslo_messaging_notifications]
{%- if volume.notification %}
{%- if volume.notification is mapping %}
driver = {{ volume.notification.get('driver', 'messagingv2') }}
{%- if volume.notification.topics is defined %}
topics = {{ volume.notification.topics }}
{%- endif %}
{%- elif volume.notification %}
driver = messagingv2
{%- endif %}