diff --git a/heat/templates/cron-job-engine-cleaner.yaml b/heat/templates/cron-job-engine-cleaner.yaml index c63159fe8b..1a71a372d8 100644 --- a/heat/templates/cron-job-engine-cleaner.yaml +++ b/heat/templates/cron-job-engine-cleaner.yaml @@ -70,10 +70,12 @@ spec: mountPath: /etc/heat/heat.conf subPath: heat.conf readOnly: true + {{ if .Values.conf.heat.DEFAULT.log_config_append }} - name: heat-etc mountPath: {{ .Values.conf.heat.DEFAULT.log_config_append }} subPath: {{ base .Values.conf.heat.DEFAULT.log_config_append }} readOnly: true + {{ end }} {{ if $mounts_heat_engine_cleaner.volumeMounts }}{{ toYaml $mounts_heat_engine_cleaner.volumeMounts | indent 14 }}{{ end }} volumes: - name: etcheat diff --git a/heat/templates/cron-job-purge-deleted.yaml b/heat/templates/cron-job-purge-deleted.yaml index 7539f1e9b4..0e0c2ce180 100644 --- a/heat/templates/cron-job-purge-deleted.yaml +++ b/heat/templates/cron-job-purge-deleted.yaml @@ -68,10 +68,12 @@ spec: mountPath: /etc/heat/heat.conf subPath: heat.conf readOnly: true + {{ if .Values.conf.heat.DEFAULT.log_config_append }} - name: heat-etc mountPath: {{ .Values.conf.heat.DEFAULT.log_config_append }} subPath: {{ base .Values.conf.heat.DEFAULT.log_config_append }} readOnly: true + {{ end }} {{ if $mounts_heat_purge_deleted.volumeMounts }}{{ toYaml $mounts_heat_purge_deleted.volumeMounts | indent 14 }}{{ end }} volumes: - name: etcheat diff --git a/heat/templates/deployment-api.yaml b/heat/templates/deployment-api.yaml index 528a772690..ff022d13ec 100644 --- a/heat/templates/deployment-api.yaml +++ b/heat/templates/deployment-api.yaml @@ -90,10 +90,12 @@ spec: mountPath: /etc/heat/heat.conf subPath: heat.conf readOnly: true + {{ if .Values.conf.heat.DEFAULT.log_config_append }} - name: heat-etc mountPath: {{ .Values.conf.heat.DEFAULT.log_config_append }} subPath: {{ base .Values.conf.heat.DEFAULT.log_config_append }} readOnly: true + {{ end }} - name: heat-etc mountPath: /etc/heat/api-paste.ini subPath: api-paste.ini diff --git a/heat/templates/deployment-cfn.yaml b/heat/templates/deployment-cfn.yaml index e085f77a9b..817233612b 100644 --- a/heat/templates/deployment-cfn.yaml +++ b/heat/templates/deployment-cfn.yaml @@ -90,10 +90,12 @@ spec: mountPath: /etc/heat/heat.conf subPath: heat.conf readOnly: true + {{ if .Values.conf.heat.DEFAULT.log_config_append }} - name: heat-etc mountPath: {{ .Values.conf.heat.DEFAULT.log_config_append }} subPath: {{ base .Values.conf.heat.DEFAULT.log_config_append }} readOnly: true + {{ end }} - name: heat-etc mountPath: /etc/heat/api-paste.ini subPath: api-paste.ini diff --git a/heat/templates/deployment-cloudwatch.yaml b/heat/templates/deployment-cloudwatch.yaml index b350cb4574..837f11afb1 100644 --- a/heat/templates/deployment-cloudwatch.yaml +++ b/heat/templates/deployment-cloudwatch.yaml @@ -86,10 +86,12 @@ spec: mountPath: /etc/heat/heat.conf subPath: heat.conf readOnly: true + {{ if .Values.conf.heat.DEFAULT.log_config_append }} - name: heat-etc mountPath: {{ .Values.conf.heat.DEFAULT.log_config_append }} subPath: {{ base .Values.conf.heat.DEFAULT.log_config_append }} readOnly: true + {{ end }} - name: heat-etc mountPath: /etc/heat/api-paste.ini subPath: api-paste.ini diff --git a/heat/templates/deployment-engine.yaml b/heat/templates/deployment-engine.yaml index 3b603caeb4..b595b088e7 100644 --- a/heat/templates/deployment-engine.yaml +++ b/heat/templates/deployment-engine.yaml @@ -88,10 +88,12 @@ spec: mountPath: /etc/heat/heat.conf subPath: heat.conf readOnly: true + {{ if .Values.conf.heat.DEFAULT.log_config_append }} - name: heat-etc mountPath: {{ .Values.conf.heat.DEFAULT.log_config_append }} subPath: {{ base .Values.conf.heat.DEFAULT.log_config_append }} readOnly: true + {{ end }} - name: heat-etc mountPath: /etc/heat/policy.json subPath: policy.json