Merge "Heat: Make it optional to use log_config_append option"

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

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

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

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

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

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