openstack
/
openstack-ansible-os_magnum
Code Issues Proposed changes

Update messaging notification configuration 

This patch add 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. For example, if the
transport_url is not provided in the notification section of the
service configuration, the transport_url specified in the default
section will be used instead.

This patch conditionally selects the notifier driver. The noop
driver will be selected when notification publishing is disabled.
The messagingv2 driver is selected when notification publishing is
enabled.

Change-Id: Iaadc0d852c003e653e00b4736ddc28f16ddfec5a
Closes-Bug: #1794320
This commit is contained in:
ZhijunWei 2018-09-19 08:20:41 -04:00 committed by weizj
parent 024a35d700
commit 9508e525ed
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
defaults/main.yml
View File

@ -16,6 +16,9 @@
## Verbosity Options
debug: False
# Enable/Disable Ceilometer
magnum_ceilometer_enabled: False
# Set the host which will execute the shade modules
# for the service setup. The host must already have
# clouds.yaml properly configured.

1
templates/magnum.conf.j2
View File

@ -69,6 +69,7 @@ endpoint_type = internalURL
endpoint_type = internalURL
[oslo_messaging_notifications]
driver = {% if magnum_ceilometer_enabled %}messagingv2{% else %}noop{% endif %}
transport_url = {{ magnum_oslomsg_notify_transport }}://{% for host in magnum_oslomsg_notify_servers.split(',') %}{{ magnum_oslomsg_notify_userid }}:{{ magnum_oslomsg_notify_password }}@{{ host }}:{{ magnum_oslomsg_notify_port }}{% if not loop.last %},{% else %}/{{ magnum_oslomsg_notify_vhost }}{% if magnum_oslomsg_notify_use_ssl | bool %}?ssl=1{% else %}?ssl=0{% endif %}{% endif %}{% endfor %}
[oslo_messaging_rabbit]