From 1283febbb18f994d329ed83738ec7bd20aabd329 Mon Sep 17 00:00:00 2001 From: Duong Ha-Quang Date: Mon, 29 May 2017 17:22:28 +0700 Subject: [PATCH] Move WEBSSO_INITIAL_CHOICE setting to variable Currently, WEBSSO_INITIAL_CHOICE is hard-coded in template, this patchset convert WEBSSO_INITIAL_CHOICE setting to variable horizon_websso_initial_choice in main.yml Change-Id: I7e18ec981f6a575ee81da1429545f8b46a771fb8 Closes-bug: #1660322 --- defaults/main.yml | 5 +++++ templates/horizon_local_settings.py.j2 | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/defaults/main.yml b/defaults/main.yml index 57e8fed4..da40ff60 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -301,3 +301,8 @@ horizon_config_overrides: {} horizon_keystone_admin_roles: - admin + +# Set the "credentials" authentication choice to show as default. +# The list of authentication mechanisms which include keystone +# federation protocols and identity provider/federation protocol +horizon_websso_initial_choice: "credentials" diff --git a/templates/horizon_local_settings.py.j2 b/templates/horizon_local_settings.py.j2 index 41238d0a..bcf02415 100644 --- a/templates/horizon_local_settings.py.j2 +++ b/templates/horizon_local_settings.py.j2 @@ -176,7 +176,7 @@ OPENSTACK_KEYSTONE_DEFAULT_ROLE = "{{ horizon_default_role_name }}" WEBSSO_ENABLED = True # Determines which authentication choice to show as default. -WEBSSO_INITIAL_CHOICE = "credentials" +WEBSSO_INITIAL_CHOICE = "{{ horizon_websso_initial_choice }}" # The list of authentication mechanisms which include keystone # federation protocols and identity provider/federation protocol