Merge "Horizon enable v3 keystone support."

This commit is contained in:
Zuul 2018-03-22 16:01:51 +00:00 committed by Gerrit Code Review
commit 5ac6970b53
2 changed files with 4 additions and 2 deletions

View File

@ -76,11 +76,11 @@ OPENSTACK_API_VERSIONS = {
# Set this to True if running on multi-domain model. When this is enabled, it
# will require user to enter the Domain name in addition to username for login.
#OPENSTACK_KEYSTONE_MULTIDOMAIN_SUPPORT = False
OPENSTACK_KEYSTONE_MULTIDOMAIN_SUPPORT = '{{ .Values.local_settings.keystone_multidomain_support }}'
# 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 = 'Default'
OPENSTACK_KEYSTONE_DEFAULT_DOMAIN = '{{ .Values.local_settings.keystone_default_domain }}'
# Set Console type:
# valid options are "AUTO"(default), "VNC", "SPICE", "RDP", "SERIAL" or None

View File

@ -55,6 +55,8 @@ network:
local_settings:
horizon_secret_key: 9aee62c0-5253-4a86-b189-e0fb71fa503c
debug: "True"
keystone_multidomain_support: "True"
keystone_default_domain: Default
openstack_cinder_features:
enable_backup: "True"
openstack_neutron_network: