From eb339ee4ec9c96d825d41e19056fc67699987131 Mon Sep 17 00:00:00 2001 From: Andy McCrae Date: Fri, 25 Nov 2016 12:20:59 +0000 Subject: [PATCH] Fix keystone_sp conditional In patch https://review.openstack.org/#/c/309425/ we defaulted the keystone_sp var to exist and be set to "{}". All conditionals were changed to check if keytone_sp was "{}" rather than to check if it is defined. The horizon role still does a conditional to check if the var is defined, rather than a check to see if it is "{}". This causes the conditional to fail when the var is defaulted in user_variables, but has no values in it. Change-Id: Ib4cd0b168ec09a222e7a1da5672395852f3f8a1c --- templates/horizon_local_settings.py.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/horizon_local_settings.py.j2 b/templates/horizon_local_settings.py.j2 index f100daaa..85a1b3fc 100644 --- a/templates/horizon_local_settings.py.j2 +++ b/templates/horizon_local_settings.py.j2 @@ -170,7 +170,7 @@ OPENSTACK_KEYSTONE_URL = "{{ horizon_keystone_endpoint }}" # The default role assigned to users OPENSTACK_KEYSTONE_DEFAULT_ROLE = "{{ horizon_default_role_name }}" -{% if keystone_sp is defined %} +{% if keystone_sp is defined and keystone_sp != {} -%} # Enables keystone web single-sign-on if set to True. WEBSSO_ENABLED = True