openstack
/
openstack-ansible-os_horizon
Code Issues Proposed changes

Add conditional for multi-domain support 

When running a multi-domain cloud the constant
"OPENSTACK_KEYSTONE_DEFAULT_DOMAIN" needs to be omitted from the
rendered "local_setting.py" file. This change keys off of the
"horizon_keystone_multidomain_support" value and should it be `true`
the constant "OPENSTACK_KEYSTONE_DEFAULT_DOMAIN" will be omitted from
config.

Closes-Bug: #1629865
Change-Id: I81c5d17bfd4d946567a49db9adfb4285d05303c3
Signed-off-by: Kevin Carter <kevin.carter@rackspace.com>
This commit is contained in:
Kevin Carter 2016-10-14 14:31:35 -05:00
parent 30095eae31
commit 92d57b525e
No known key found for this signature in database
GPG Key ID: 69FEFFC5E2D9273F
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
templates/horizon_local_settings.py.j2
View File

@ -68,9 +68,11 @@ 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 }}
{% 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 }}"
{% endif %}
{% endif %}
# Set Console type: