From f7bb0d11b1618682501d734042137895f86401f9 Mon Sep 17 00:00:00 2001 From: Kevin Carter Date: Thu, 7 Feb 2019 22:33:37 +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: I3ca44a9d70eadeb1a82d5f8aa35ec417de5503d5 Signed-off-by: Kevin Carter --- templates/sahara.conf.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/sahara.conf.j2 b/templates/sahara.conf.j2 index d2806fc..6ecbf47 100644 --- a/templates/sahara.conf.j2 +++ b/templates/sahara.conf.j2 @@ -56,7 +56,7 @@ policy_dirs = {{ sahara_policy_dirs }} # Ceilometer options [oslo_messaging_notifications] -driver = {% if sahara_ceilometer_enabled %}messagingv2{% else %}noop{% endif %} +driver = {{ (sahara_ceilometer_enabled | bool) | ternary('messagingv2', 'noop') }} transport_url = {{ sahara_oslomsg_notify_transport }}://{% for host in sahara_oslomsg_notify_servers.split(',') %}{{ sahara_oslomsg_notify_userid }}:{{ sahara_oslomsg_notify_password }}@{{ host }}:{{ sahara_oslomsg_notify_port }}{% if not loop.last %},{% else %}/{{ sahara_oslomsg_notify_vhost }}{% if sahara_oslomsg_notify_use_ssl | bool %}?ssl=1{% else %}?ssl=0{% endif %}{% endif %}{% endfor %} [oslo_messaging_rabbit]