openstack/openstack-helm
Code Issues Proposed changes

Add local_settings.d

Browse Source 
Change-Id: Ibf64d80a10e1bbe46bdeb931340e3f7e2c3003db
This commit is contained in:
root 2021-08-04 21:54:22 +02:00 committed by okozachenko
parent 12afaa53ee
commit 85f2ced17f
6 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
horizon/Chart.yaml
View File

@ -14,7 +14,7 @@ apiVersion: v1
appVersion: v1.0.0
description: OpenStack-Helm Horizon
name: horizon
version: 0.2.14
version: 0.2.15
home: https://docs.openstack.org/horizon/latest/
icon: https://www.openstack.org/themes/openstack/images/project-mascots/Horizon/OpenStack_Project_Horizon_vertical.png
sources:

3
horizon/templates/bin/_horizon.sh.tpl
View File

@ -22,6 +22,9 @@ function start () {
rm -f ${SITE_PACKAGES_ROOT}/openstack_dashboard/local/local_settings.py
ln -s /etc/openstack-dashboard/local_settings ${SITE_PACKAGES_ROOT}/openstack_dashboard/local/local_settings.py
ln -s ${SITE_PACKAGES_ROOT}/openstack_dashboard/conf/default_policies /etc/openstack-dashboard/default_policies
{{- range $key, $value := .Values.conf.horizon.local_settings_d }}
ln -s /etc/openstack-dashboard/local_settings.d/{{ $key }}.py ${SITE_PACKAGES_ROOT}/openstack_dashboard/local/local_settings.d/{{ $key }}.py
{{- end }}
# wsgi/horizon-http needs open files here, including secret_key_store
chown -R horizon ${SITE_PACKAGES_ROOT}/openstack_dashboard/local/

3
horizon/templates/configmap-etc.yaml
View File

@ -32,4 +32,7 @@ data:
{{- range $key, $value := .Values.conf.horizon.policy }}
{{ printf "%s_policy.yaml" $key }}: {{ toYaml $value | b64enc }}
{{- end }}
{{- range $key, $value := .Values.conf.horizon.local_settings_d }}
{{ printf "%s.py" $key }}: {{ $value | b64enc }}
{{- end }}
{{- end }}

7
horizon/templates/deployment.yaml
View File

@ -136,6 +136,13 @@ spec:
subPath: {{ base $policyJsonFile }}
readOnly: true
{{- end }}
{{- range $key, $value := $envAll.Values.conf.horizon.local_settings_d }}
{{- $localSettingsFile := printf "/etc/openstack-dashboard/local_settings.d/%s.py" $key }}
- name: horizon-etc
mountPath: {{ $localSettingsFile }}
subPath: {{ base $localSettingsFile }}
readOnly: true
{{- end }}
{{- dict "enabled" $envAll.Values.manifests.certificates "name" $envAll.Values.secrets.tls.dashboard.dashboard.internal "path" "/etc/openstack-dashboard/certs" | include "helm-toolkit.snippets.tls_volume_mount" | indent 12 }}
{{- dict "enabled" $envAll.Values.manifests.certificates "name" $envAll.Values.endpoints.oslo_db.auth.admin.secret.tls.internal "path" "/etc/mysql/certs" | include "helm-toolkit.snippets.tls_volume_mount" | indent 12 }}
{{ if $mounts_horizon.volumeMounts }}{{ toYaml $mounts_horizon.volumeMounts | indent 12 }}{{ end }}

8
horizon/values.yaml
View File

@ -177,6 +177,14 @@ conf:
# site as frames. This defends against clickjacking attacks.
# Requires mod_headers to be enabled.
#
local_settings_d: {}
## For example, _50_monasca_ui_settings.py
# _50_monasca_ui_settings: |
# from django.conf import settings
# # Grafana button titles/file names (global across all projects):
# GRAFANA_LINKS = []
# DASHBOARDS = getattr(settings, 'GRAFANA_LINKS', GRAFANA_LINKS)
local_settings:
config:
# Use "True" and "False" as Titlecase strings with quotes, boolean

1
releasenotes/notes/horizon.yaml
View File

@ -24,4 +24,5 @@ horizon:
- 0.2.12 Support both json and yaml RBAC Policy Format
- 0.2.13 Add container infra api version in values
- 0.2.14 Add OPENSTACK_ENDPOINT_TYPE value
- 0.2.15 Add local_settings.d
...