Merge "Horizon multidomain flag"

This commit is contained in:
Jenkins 2017-09-26 10:39:31 +00:00 committed by Gerrit Code Review
commit 9874b1b36c
3 changed files with 7 additions and 1 deletions

View File

@ -576,6 +576,7 @@ murano_agent_rabbitmq_user: "muranoagent"
# Horizon options # Horizon options
####################### #######################
horizon_backend_database: "{{ enable_murano | bool }}" horizon_backend_database: "{{ enable_murano | bool }}"
horizon_keystone_multidomain: False
################# #################

View File

@ -87,7 +87,7 @@ OPENSTACK_API_VERSIONS = {
# Set this to True if running on a multi-domain model. When this is enabled, it # Set this to True if running on a multi-domain model. When this is enabled, it
# will require the user to enter the Domain name in addition to the username # will require the user to enter the Domain name in addition to the username
# for login. # for login.
#OPENSTACK_KEYSTONE_MULTIDOMAIN_SUPPORT = False OPENSTACK_KEYSTONE_MULTIDOMAIN_SUPPORT = {{ horizon_keystone_multidomain | bool }}
# Overrides the default domain used when running on single-domain model # Overrides the default domain used when running on single-domain model
# with Keystone V3. All entities will be created in the default domain. # with Keystone V3. All entities will be created in the default domain.

View File

@ -0,0 +1,5 @@
---
features:
- |
Added horizon_keystone_multidomain flag for horizon multidomain support.
This flag can be overriden in globals.yml. Default value: False