From 327456e73aa6f46d96eb89357df397ce8cca1e1c Mon Sep 17 00:00:00 2001 From: Kevin Carter Date: Thu, 7 Feb 2019 22:33:39 +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: Ic61c0dc953903a5a531565ae5deb773b348ec2ef Signed-off-by: Kevin Carter --- templates/tacker.conf.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/tacker.conf.j2 b/templates/tacker.conf.j2 index ff5f349..e4f56a3 100644 --- a/templates/tacker.conf.j2 +++ b/templates/tacker.conf.j2 @@ -102,5 +102,5 @@ openstack = {{ tacker_etc_dir }}/vim/fernet_keys ssl = {{ tacker_oslomsg_notify_use_ssl | bool }} [oslo_messaging_notifications] -driver = {% if tacker_ceilometer_enabled %}messagingv2{% else %}noop{% endif %} +driver = {{ (tacker_ceilometer_enabled | bool) | ternary('messagingv2', 'noop') }} transport_url = {{ tacker_oslomsg_notify_transport }}://{% for host in tacker_oslomsg_notify_servers.split(',') %}{{ tacker_oslomsg_notify_userid }}:{{ tacker_oslomsg_notify_password }}@{{ host }}:{{ tacker_oslomsg_notify_port }}{% if not loop.last %},{% else %}/{{ tacker_oslomsg_notify_vhost }}{% if (tacker_oslomsg_notify_use_ssl | lower) | bool %}?ssl=1{% else %}?ssl=0{% endif %}{% endif %}{% endfor %}