From b40f4b5e1aa2f26384a35424c27cb0a363538ebf Mon Sep 17 00:00:00 2001 From: Kevin Carter Date: Thu, 7 Feb 2019 22:33:26 +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: I78293b35a30ea12da25fc11d7a5c33cdf2982e2d Signed-off-by: Kevin Carter --- templates/keystone.conf.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/keystone.conf.j2 b/templates/keystone.conf.j2 index bc32d0e2..d0d45a8d 100644 --- a/templates/keystone.conf.j2 +++ b/templates/keystone.conf.j2 @@ -23,7 +23,7 @@ transport_url = {{ keystone_oslomsg_rpc_transport }}://{% for host in keystone_o ssl = {{ keystone_oslomsg_rpc_use_ssl }} [oslo_messaging_notifications] -driver = {% if keystone_ceilometer_enabled %}messagingv2{% else %}noop{% endif %} +driver = {{ (keystone_ceilometer_enabled | bool) | ternary('messagingv2', 'noop') }} transport_url = {{ keystone_oslomsg_notify_transport }}://{% for host in keystone_oslomsg_notify_servers.split(',') %}{{ keystone_oslomsg_notify_userid }}:{{ keystone_oslomsg_notify_password }}@{{ host }}:{{ keystone_oslomsg_notify_port }}{% if not loop.last %},{% else %}/{{ keystone_oslomsg_notify_vhost }}{% if keystone_oslomsg_notify_use_ssl | bool %}?ssl=1{% else %}?ssl=0{% endif %}{% endif %}{% endfor %} {% if keystone_cache_servers | length > 0 %}