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:
parent
9b8cdbc525
commit
db1bd3091d
@ -261,7 +261,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
|
||||||
|
@ -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 }}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user