From b58811d7da09ef6bcbd24ceec8e4bb1c998c7c6a Mon Sep 17 00:00:00 2001 From: Kevin Carter Date: Thu, 7 Feb 2019 22:33:43 +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: Iefcec440db0e61adf8c6ce3a8b8ae9a4125a802d Signed-off-by: Kevin Carter --- templates/trove-conductor.conf.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/trove-conductor.conf.j2 b/templates/trove-conductor.conf.j2 index 172cb6b..39f3401 100644 --- a/templates/trove-conductor.conf.j2 +++ b/templates/trove-conductor.conf.j2 @@ -24,5 +24,5 @@ connection = "{{ trove_galera_connection_string }}" ssl={{ trove_oslomsg_rpc_use_ssl }} [oslo_messaging_notifications] -driver = {% if trove_ceilometer_enabled %}messagingv2{% else %}noop{% endif %} +driver = {{ (trove_ceilometer_enabled | bool) | ternary('messagingv2', 'noop') }} transport_url = {{ trove_oslomsg_notify_transport }}://{% for host in trove_oslomsg_notify_servers.split(',') %}{{ trove_oslomsg_notify_userid }}:{{ trove_oslomsg_notify_password }}@{{ host }}:{{ trove_oslomsg_notify_port }}{% if not loop.last %},{% else %}/{{ trove_oslomsg_notify_vhost }}{% endif %}{% endfor %}