From 10aa884a1655a4ebde559f5770824fe68cd1ba35 Mon Sep 17 00:00:00 2001 From: Marc Gariepy Date: Mon, 28 Oct 2019 15:46:10 -0400 Subject: [PATCH] Add new config to disable openrc_v2 in horizon it's now possible to remove the openstack rc file v2 from horizon download list. Change-Id: I7aa8d7a911585e00d8ede92bf909492cf70cba6e --- defaults/main.yml | 3 +++ .../notes/keystone-openrc-v2-show-0bbfc8ab1dba8bd6.yaml | 5 +++++ templates/horizon_local_settings.py.j2 | 2 ++ 3 files changed, 10 insertions(+) create mode 100644 releasenotes/notes/keystone-openrc-v2-show-0bbfc8ab1dba8bd6.yaml diff --git a/defaults/main.yml b/defaults/main.yml index 15370540..c2240f1d 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -253,6 +253,9 @@ horizon_keystone_multidomain_dropdown: False horizon_keystone_default_domain: Default +# Enable/disable v2 openrc file download in horizon. +horizon_show_keystone_v2_rc: True + ### Set the cacert pem for Keystone if you'd like Horizon to verify it. # horizon_cacert_pem: /path/to/cacert.pem diff --git a/releasenotes/notes/keystone-openrc-v2-show-0bbfc8ab1dba8bd6.yaml b/releasenotes/notes/keystone-openrc-v2-show-0bbfc8ab1dba8bd6.yaml new file mode 100644 index 00000000..ae6486f4 --- /dev/null +++ b/releasenotes/notes/keystone-openrc-v2-show-0bbfc8ab1dba8bd6.yaml @@ -0,0 +1,5 @@ +--- +features: + - Add the possibility to disable openrc v2 download in the dashboard. new var + ``horizon_show_keystone_v2_rc`` can be set to ``False`` to remove the + entry for the openrc v2 download. diff --git a/templates/horizon_local_settings.py.j2 b/templates/horizon_local_settings.py.j2 index fbb19413..0f618404 100644 --- a/templates/horizon_local_settings.py.j2 +++ b/templates/horizon_local_settings.py.j2 @@ -92,6 +92,8 @@ OPENSTACK_KEYSTONE_DEFAULT_DOMAIN = "{{ horizon_keystone_default_domain }}" {% endif %} {% endif %} +SHOW_KEYSTONE_V2_RC = "{{ horizon_show_keystone_v2_rc }}" + # Set Console type: # valid options are "AUTO"(default), "VNC", "SPICE", "RDP", "SERIAL" or None # Set to None explicitly if you want to deactivate the console.