openstack
/
openstack-ansible-os_horizon
Code Issues Proposed changes

Merge "Horizon configuration to support domains dropdown"

This commit is contained in:
Zuul 2020-04-10 22:25:18 +00:00 committed by Gerrit Code Review
parent 3e60a13650 d86285b377
commit dfce587e72
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
defaults/main.yml
View File

@ -255,6 +255,11 @@ horizon_keystone_multidomain_dropdown: False
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 }}'))"
# Enable/disable v2 openrc file download in horizon.
horizon_show_keystone_v2_rc: True

7
templates/horizon_local_settings.py.j2
View File

@ -84,14 +84,13 @@ OPENSTACK_API_VERSIONS = {
# will require user to enter the Domain name in addition to username for login.
OPENSTACK_KEYSTONE_MULTIDOMAIN_SUPPORT = {{ horizon_keystone_multidomain_support | bool }}
{% if horizon_keystone_multidomain_support | bool %}
OPENSTACK_KEYSTONE_DOMAIN_DROPDOWN = {{ horizon_keystone_multidomain_dropdown | bool }}
{% endif %}
{% if not horizon_keystone_multidomain_support | bool %}
# Overrides the default domain used when running on single-domain model
# with Keystone V3. All entities will be created in the default domain.
OPENSTACK_KEYSTONE_DEFAULT_DOMAIN = "{{ horizon_keystone_default_domain }}"
{% else %}
OPENSTACK_KEYSTONE_DOMAIN_DROPDOWN = "{{ horizon_keystone_multidomain_dropdown | bool }}"
OPENSTACK_KEYSTONE_DOMAIN_CHOICES = "{{ horizon_keystone_multidomain_choices }}"
{% endif %}
{% endif %}