openstack/openstack-ansible-os_horizon
Code Issues Proposed changes

Merge "Fix default multidomain choices"

Browse Source
This commit is contained in:
Zuul 2022-01-26 17:01:19 +00:00 committed by Gerrit Code Review
commit aa976a0544
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

@ -264,7 +264,7 @@ horizon_keystone_default_domain: Default
# Option to set the available domains to choose from. This is # Option to set the available domains to choose from. This is
# a list of pairs whose first value is the domain name and the # a list of pairs whose first value is the domain name and the
# second is the display name. # 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. # Enable/disable v2 openrc file download in horizon.
horizon_show_keystone_v2_rc: True horizon_show_keystone_v2_rc: True

2
templates/horizon_local_settings.py.j2
View File

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