openstack/openstack-helm
Code Issues Proposed changes

Add the conditional statement for log_config_append

Browse Source 
As the nova.DEFAULT.log_config_append is a aption
for the configuration of nova, we should be add
condtional statement here.

Change-Id: Ib9c50c9ccc0c93226fffccc997c232b0259dff0c
This commit is contained in:
dengzhaosen 2023-11-30 16:44:31 +08:00
parent b50501344f
commit 2dfccce221
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nova/Chart.yaml
View File

@ -14,7 +14,7 @@ apiVersion: v1
appVersion: v1.0.0 appVersion: v1.0.0
description: OpenStack-Helm Nova description: OpenStack-Helm Nova
name: nova name: nova
version: 0.3.29 version: 0.3.30
home: https://docs.openstack.org/nova/latest/ home: https://docs.openstack.org/nova/latest/
icon: https://www.openstack.org/themes/openstack/images/project-mascots/Nova/OpenStack_Project_Nova_vertical.png icon: https://www.openstack.org/themes/openstack/images/project-mascots/Nova/OpenStack_Project_Nova_vertical.png
sources: sources:

7
nova/templates/job-bootstrap.yaml
View File

@ -20,7 +20,6 @@ limitations under the License.
{{- $configMapBin := printf "%s-%s" $serviceName "bin" -}} {{- $configMapBin := printf "%s-%s" $serviceName "bin" -}}
{{- $configMapEtc := printf "%s-%s" $serviceName "etc" -}} {{- $configMapEtc := printf "%s-%s" $serviceName "etc" -}}
{{- $configFile := printf "/etc/%s/%s.conf" $serviceName $serviceName -}} {{- $configFile := printf "/etc/%s/%s.conf" $serviceName $serviceName -}}
{{- $logConfigFile := $envAll.Values.conf.nova.DEFAULT.log_config_append -}}
{{- $nodeSelector := index . "nodeSelector" | default ( dict $envAll.Values.labels.job.node_selector_key $envAll.Values.labels.job.node_selector_value ) -}} {{- $nodeSelector := index . "nodeSelector" | default ( dict $envAll.Values.labels.job.node_selector_key $envAll.Values.labels.job.node_selector_value ) -}}
{{- $serviceAccountName := printf "%s-%s" $serviceName "bootstrap" -}} {{- $serviceAccountName := printf "%s-%s" $serviceName "bootstrap" -}}
{{ tuple $envAll "bootstrap" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} {{ tuple $envAll "bootstrap" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
@ -97,10 +96,12 @@ spec:
mountPath: {{ $configFile | quote }} mountPath: {{ $configFile | quote }}
subPath: {{ base $configFile | quote }} subPath: {{ base $configFile | quote }}
readOnly: true readOnly: true
{{- if .Values.conf.nova.DEFAULT.log_config_append }}
- name: bootstrap-conf - name: bootstrap-conf
mountPath: {{ $logConfigFile | quote }} mountPath: {{ .Values.conf.nova.DEFAULT.log_config_append | quote }}
subPath: {{ base $logConfigFile | quote }} subPath: {{ base .Values.conf.nova.DEFAULT.log_config_append | quote }}
readOnly: true readOnly: true
{{- end }}
{{- dict "enabled" (or .Values.manifests.certificates .Values.tls.identity) "name" .Values.secrets.tls.compute.osapi.internal | include "helm-toolkit.snippets.tls_volume_mount" | indent 12 }} {{- dict "enabled" (or .Values.manifests.certificates .Values.tls.identity) "name" .Values.secrets.tls.compute.osapi.internal | include "helm-toolkit.snippets.tls_volume_mount" | indent 12 }}
volumes: volumes:
- name: pod-tmp - name: pod-tmp

1
releasenotes/notes/nova.yaml
View File

@ -98,4 +98,5 @@ nova:
- 0.3.27 Add 2023.2 Ubuntu Jammy overrides - 0.3.27 Add 2023.2 Ubuntu Jammy overrides
- 0.3.28 Add ability to define extra command(s) for the nova cell setup job - 0.3.28 Add ability to define extra command(s) for the nova cell setup job
- 0.3.29 Add ability to define extra command(s) for the nova service cleaner job - 0.3.29 Add ability to define extra command(s) for the nova service cleaner job
- 0.3.30 Add the conditional statement for log_config_append
... ...