From bceb008249c0c2dbdf6d5bdc43b8a3a6a7c8bb09 Mon Sep 17 00:00:00 2001 From: Kevin Carter Date: Thu, 7 Feb 2019 22:32:45 +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: I2645beb3eed1948f66f76fc7eb45e14923abfa78 Signed-off-by: Kevin Carter --- templates/designate.conf.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/designate.conf.j2 b/templates/designate.conf.j2 index 20cea70..00b8191 100644 --- a/templates/designate.conf.j2 +++ b/templates/designate.conf.j2 @@ -33,7 +33,7 @@ rabbit_notification_exchange = designate rabbit_notification_topic = notifications [oslo_messaging_notifications] -driver = {% if designate_ceilometer_enabled %}messagingv2{% else %}noop{% endif %} +driver = {{ (designate_ceilometer_enabled | bool) | ternary('messagingv2', 'noop') }} transport_url = {{ designate_oslomsg_notify_transport }}://{% for host in designate_oslomsg_notify_servers.split(',') %}{{ designate_oslomsg_notify_userid }}:{{ designate_oslomsg_notify_password }}@{{ host }}:{{ designate_oslomsg_notify_port }}{% if not loop.last %},{% else %}/{{ designate_oslomsg_notify_vhost }}{% if designate_oslomsg_notify_use_ssl | bool %}?ssl=1{% else %}?ssl=0{% endif %}{% endif %}{% endfor %} ########################