From 33b192bfd986e4e166ef13af994d0ecf5acf47ce Mon Sep 17 00:00:00 2001 From: Kevin Carter Date: Thu, 7 Feb 2019 22:33:35 +0000 Subject: [PATCH] Correct notification driver The notification driver setup was resulting in the driver and connection string on the same line. This is caused by the case statement and how jinja formats the template when a case statement is present. This change modifies how the driver string is created using a ternary, which will eliminate the case statement and render the value of the diver correctly. Change-Id: I1c0296886a7cc37089233f241f79c92696ebac3a Signed-off-by: Kevin Carter --- templates/magnum.conf.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/magnum.conf.j2 b/templates/magnum.conf.j2 index 6ea8d91..85eeb13 100644 --- a/templates/magnum.conf.j2 +++ b/templates/magnum.conf.j2 @@ -75,7 +75,7 @@ region_name = {{ magnum_nova_service_region }} endpoint_type = internalURL [oslo_messaging_notifications] -driver = {% if magnum_ceilometer_enabled %}messagingv2{% else %}noop{% endif %} +driver = {{ (magnum_ceilometer_enabled | bool) | ternary('messagingv2', 'noop') }} 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]