From ab3b60c1972babeb724bc8d8d0bf3d52823af0f2 Mon Sep 17 00:00:00 2001 From: Thiago Brito Date: Mon, 12 Jul 2021 11:36:07 -0300 Subject: [PATCH] Fix custom horizon theme load When loading a custom theme, the current configuration also loads the StarlingX theme which is not available on the Openstack Horizon image. This fix removes the loading of the StarlingX theme and fixes the logic so other themes are enabled when the custom one is not. Closes-Bug: #1935859 Signed-off-by: Thiago Brito Change-Id: I14975ee07210875f0e5c49c13e3371a18c4b2261 --- .../stx-openstack-helm/manifests/manifest.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/stx-openstack-helm/stx-openstack-helm/manifests/manifest.yaml b/stx-openstack-helm/stx-openstack-helm/manifests/manifest.yaml index 157903fc..595843f4 100644 --- a/stx-openstack-helm/stx-openstack-helm/manifests/manifest.yaml +++ b/stx-openstack-helm/stx-openstack-helm/manifests/manifest.yaml @@ -3730,16 +3730,16 @@ data: " parameters:[%(param)s] message:[%(message)s]"), } + AVAILABLE_THEMES = [ + ('default', 'Default', 'themes/default'), + ('material', 'Material', 'themes/material'), + ] + # Custom Theme Override for root, dirs, files in os.walk('/opt/branding/applied'): if 'manifest.py' in files: exec(open(os.path.join(root, 'manifest.py')).read()) - AVAILABLE_THEMES = [ - ('default', 'Default', 'themes/default'), - ('material', 'Material', 'themes/material'), - ('starlingx', 'StarlingX', 'themes/starlingx'), - ('custom', 'Custom', '/opt/branding/applied'), - ] + AVAILABLE_THEMES.append(('custom', 'Custom', '/opt/branding/applied')) DEFAULT_THEME = 'custom' # Secure site configuration