openstack/openstack-ansible-os_glance
Code Issues Proposed changes

Update messaging notification configuration

Browse Source 
This patch removes the conditional inclusion of the notification
section of the service configuration. This ensures that oslo.messaging
notifications use the correct transport for deployments that have
separate rpc and notify messaging backends.

This patch conditionally selects the notifier driver for when
ceilometer is enabled.

Change-Id: Ie73bf32a62d0e959e4905de31517b20b83b5c583
This commit is contained in:
Andy Smith 2018-09-24 09:55:33 -04:00
parent 482d8580b0
commit 209e2ba35c
3 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tasks/main.yml
View File

@ -63,7 +63,6 @@
_oslomsg_notify_password: "{{ glance_oslomsg_notify_password }}" _oslomsg_notify_password: "{{ glance_oslomsg_notify_password }}"
_oslomsg_notify_vhost: "{{ glance_oslomsg_notify_vhost }}" _oslomsg_notify_vhost: "{{ glance_oslomsg_notify_vhost }}"
_oslomsg_notify_transport: "{{ glance_oslomsg_notify_transport }}" _oslomsg_notify_transport: "{{ glance_oslomsg_notify_transport }}"
_oslomsg_configure_notify: "{{ glance_ceilometer_enabled | bool }}"
tags: tags:
- common-mq - common-mq
- glance-config - glance-config

4
templates/glance-api.conf.j2
View File

@ -70,11 +70,9 @@ ssl = {{ glance_oslomsg_notify_use_ssl | bool }}
rabbit_notification_exchange = glance rabbit_notification_exchange = glance
rabbit_notification_topic = notifications rabbit_notification_topic = notifications
{% if glance_ceilometer_enabled %}
[oslo_messaging_notifications] [oslo_messaging_notifications]
driver = messagingv2 driver = {% if glance_ceilometer_enabled %}messagingv2{% else %}noop{% endif %}
transport_url = {{ glance_oslomsg_notify_transport }}://{% for host in glance_oslomsg_notify_servers.split(',') %}{{ glance_oslomsg_notify_userid }}:{{ glance_oslomsg_notify_password }}@{{ host }}:{{ glance_oslomsg_notify_port }}{% if not loop.last %},{% else %}/{{ glance_oslomsg_notify_vhost }}{% if glance_oslomsg_notify_use_ssl | bool %}?ssl=1{% else %}?ssl=0{% endif %}{% endif %}{% endfor %} transport_url = {{ glance_oslomsg_notify_transport }}://{% for host in glance_oslomsg_notify_servers.split(',') %}{{ glance_oslomsg_notify_userid }}:{{ glance_oslomsg_notify_password }}@{{ host }}:{{ glance_oslomsg_notify_port }}{% if not loop.last %},{% else %}/{{ glance_oslomsg_notify_vhost }}{% if glance_oslomsg_notify_use_ssl | bool %}?ssl=1{% else %}?ssl=0{% endif %}{% endif %}{% endfor %}
{% endif %}
[paste_deploy] [paste_deploy]
flavor = {{ glance_flavor }} flavor = {{ glance_flavor }}

4
templates/glance-registry.conf.j2
View File

@ -47,11 +47,9 @@ ssl = {{ glance_oslomsg_notify_use_ssl | bool }}
rabbit_notification_exchange = glance rabbit_notification_exchange = glance
rabbit_notification_topic = notifications rabbit_notification_topic = notifications
{% if glance_ceilometer_enabled %}
[oslo_messaging_notifications] [oslo_messaging_notifications]
driver = messagingv2 driver = {% if glance_ceilometer_enabled %}messagingv2{% else %}noop{% endif %}
transport_url = {{ glance_oslomsg_notify_transport }}://{% for host in glance_oslomsg_notify_servers.split(',') %}{{ glance_oslomsg_notify_userid }}:{{ glance_oslomsg_notify_password }}@{{ host }}:{{ glance_oslomsg_notify_port }}{% if not loop.last %},{% else %}/{{ glance_oslomsg_notify_vhost }}{% if glance_oslomsg_notify_use_ssl | bool %}?ssl=1{% else %}?ssl=0{% endif %}{% endif %}{% endfor %} transport_url = {{ glance_oslomsg_notify_transport }}://{% for host in glance_oslomsg_notify_servers.split(',') %}{{ glance_oslomsg_notify_userid }}:{{ glance_oslomsg_notify_password }}@{{ host }}:{{ glance_oslomsg_notify_port }}{% if not loop.last %},{% else %}/{{ glance_oslomsg_notify_vhost }}{% if glance_oslomsg_notify_use_ssl | bool %}?ssl=1{% else %}?ssl=0{% endif %}{% endif %}{% endfor %}
{% endif %}
[oslo_policy] [oslo_policy]
policy_file = {{ glance_policy_file }} policy_file = {{ glance_policy_file }}