openstack
/
openstack-ansible-os_horizon
Code Issues Proposed changes

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
This commit is contained in:
Andy McCrae 2016-11-25 12:20:59 +00:00
parent 111c03cc92
commit eb339ee4ec
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
templates/horizon_local_settings.py.j2
View File

@ -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