From c7a89be23bad1205ad1079b9fa2d866b1532e3d3 Mon Sep 17 00:00:00 2001 From: Pete Birley Date: Tue, 20 Mar 2018 16:49:07 -0500 Subject: [PATCH] Horizon enable v3 keystone support. This PS enables v3 kesytone support in horizon. Change-Id: If176617d37efc19925c2dc5a65d992086442fd70 --- horizon/templates/etc/_local_settings.tpl | 4 ++-- horizon/values.yaml | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/horizon/templates/etc/_local_settings.tpl b/horizon/templates/etc/_local_settings.tpl index 7efbe3e548..64dcdc46e1 100644 --- a/horizon/templates/etc/_local_settings.tpl +++ b/horizon/templates/etc/_local_settings.tpl @@ -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 diff --git a/horizon/values.yaml b/horizon/values.yaml index d7cad6ab16..32f27a9389 100644 --- a/horizon/values.yaml +++ b/horizon/values.yaml @@ -53,6 +53,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: