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>
(cherry picked from commit 92d57b525e
)
This commit is contained in:
parent
2b0d10a9ed
commit
0001eade2c
|
@ -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:
|
||||
|
|
Loading…
Reference in New Issue