From bd186a2e473e19715caa7fb20e2d7739847f9857 Mon Sep 17 00:00:00 2001 From: Pierre Hanselmann Date: Mon, 25 Sep 2017 15:27:55 +0200 Subject: [PATCH] Horizon multidomain flag Added horizon_keystone_multidomain flag. It can be now overriden in globals.yml. Default set to False. Change-Id: I6f8f261cf4b9779e57c2443ac219cdddb1731f52 --- ansible/group_vars/all.yml | 1 + ansible/roles/horizon/templates/local_settings.j2 | 2 +- .../notes/horizon_keystone_multidomain-c7a80d670f3654d8.yaml | 5 +++++ 3 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 releasenotes/notes/horizon_keystone_multidomain-c7a80d670f3654d8.yaml diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index adfac65a39..57ab8b5355 100644 --- a/ansible/group_vars/all.yml +++ b/ansible/group_vars/all.yml @@ -574,6 +574,7 @@ murano_agent_rabbitmq_user: "muranoagent" # Horizon options ####################### horizon_backend_database: "{{ enable_murano | bool }}" +horizon_keystone_multidomain: False ################# diff --git a/ansible/roles/horizon/templates/local_settings.j2 b/ansible/roles/horizon/templates/local_settings.j2 index 024169fee0..a7926ad599 100644 --- a/ansible/roles/horizon/templates/local_settings.j2 +++ b/ansible/roles/horizon/templates/local_settings.j2 @@ -87,7 +87,7 @@ OPENSTACK_API_VERSIONS = { # 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 # 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 # with Keystone V3. All entities will be created in the default domain. diff --git a/releasenotes/notes/horizon_keystone_multidomain-c7a80d670f3654d8.yaml b/releasenotes/notes/horizon_keystone_multidomain-c7a80d670f3654d8.yaml new file mode 100644 index 0000000000..3cb49bb3ec --- /dev/null +++ b/releasenotes/notes/horizon_keystone_multidomain-c7a80d670f3654d8.yaml @@ -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