scottk/openstack-helm
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/openstack-helm.git synced 2025-12-25 09:17:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Zuul
2019-04-14 18:34:46 +00:00
committed by Gerrit Code Review
parent f87025e2b8 3f83d6978c
commit a187084bdd
6 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
heat/templates/cron-job-engine-cleaner.yaml
View File

@@ -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

2
heat/templates/cron-job-purge-deleted.yaml
View File

@@ -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

2
heat/templates/deployment-api.yaml
View File

@@ -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

2
heat/templates/deployment-cfn.yaml
View File

@@ -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

2
heat/templates/deployment-cloudwatch.yaml
View File

@@ -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

2
heat/templates/deployment-engine.yaml
View File

@@ -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