openstack
/
openstack-ansible-os_horizon
Code Issues Proposed changes

Fix default multidomain choices 

We're missing comma at the end of set, which leads to error.

We additionally define condition when choices will be added to config.

Change-Id: I6b1c24fae22e9adb9e16fade4229d5761ac0b520
Closes-Bug: #1958645
This commit is contained in:
Dmitriy Rabotyagov 2022-01-25 17:22:04 +02:00 committed by Jonathan Rosser
parent 9b8cdbc525
commit db1bd3091d
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
defaults/main.yml
View File

@ -261,7 +261,7 @@ horizon_keystone_default_domain: Default
# Option to set the available domains to choose from. This is
# a list of pairs whose first value is the domain name and the
# second is the display name.
horizon_keystone_multidomain_choices: "(('{{ horizon_keystone_default_domain }}', '{{ horizon_keystone_default_domain }}'))"
horizon_keystone_multidomain_choices: "(('{{ horizon_keystone_default_domain }}', '{{ horizon_keystone_default_domain }}'),)"
# Enable/disable v2 openrc file download in horizon.
horizon_show_keystone_v2_rc: True

2
templates/horizon_local_settings.py.j2
View File

@ -90,7 +90,9 @@ OPENSTACK_KEYSTONE_MULTIDOMAIN_SUPPORT = {{ horizon_keystone_multidomain_support
OPENSTACK_KEYSTONE_DEFAULT_DOMAIN = "{{ horizon_keystone_default_domain }}"
{% else %}
OPENSTACK_KEYSTONE_DOMAIN_DROPDOWN = {{ horizon_keystone_multidomain_dropdown | bool }}
{% if horizon_keystone_multidomain_dropdown %}
OPENSTACK_KEYSTONE_DOMAIN_CHOICES = {{ horizon_keystone_multidomain_choices }}
{% endif %}
{% endif %}
{% endif %}