diff --git a/aodh/templates/cron-job-alarms-cleaner.yaml b/aodh/templates/cron-job-alarms-cleaner.yaml
index 531e715898..dc805b9753 100644
--- a/aodh/templates/cron-job-alarms-cleaner.yaml
+++ b/aodh/templates/cron-job-alarms-cleaner.yaml
@@ -66,10 +66,12 @@ spec:
mountPath: /etc/aodh/aodh.conf
subPath: aodh.conf
readOnly: true
+ {{- if .Values.conf.aodh.DEFAULT.log_config_append }}
- name: aodh-etc
mountPath: {{ .Values.conf.aodh.DEFAULT.log_config_append }}
subPath: {{ base .Values.conf.aodh.DEFAULT.log_config_append }}
readOnly: true
+ {{- end }}
{{ if $mounts_aodh_alarms_cleaner.volumeMounts }}{{ toYaml $mounts_aodh_alarms_cleaner.volumeMounts | indent 16 }}{{ end }}
volumes:
- name: pod-tmp
diff --git a/aodh/templates/deployment-api.yaml b/aodh/templates/deployment-api.yaml
index 707cfd2954..c43c9e0015 100644
--- a/aodh/templates/deployment-api.yaml
+++ b/aodh/templates/deployment-api.yaml
@@ -86,10 +86,12 @@ spec:
mountPath: /etc/aodh/aodh.conf
subPath: aodh.conf
readOnly: true
+ {{- if .Values.conf.aodh.DEFAULT.log_config_append }}
- name: aodh-etc
mountPath: {{ .Values.conf.aodh.DEFAULT.log_config_append }}
subPath: {{ base .Values.conf.aodh.DEFAULT.log_config_append }}
readOnly: true
+ {{- end }}
- name: aodh-etc
mountPath: /etc/aodh/api_paste.ini
subPath: api-paste.ini
diff --git a/aodh/templates/deployment-evaluator.yaml b/aodh/templates/deployment-evaluator.yaml
index 477f484ed5..869dcdfb01 100644
--- a/aodh/templates/deployment-evaluator.yaml
+++ b/aodh/templates/deployment-evaluator.yaml
@@ -77,10 +77,12 @@ spec:
mountPath: /etc/aodh/aodh.conf
subPath: aodh.conf
readOnly: true
+ {{- if .Values.conf.aodh.DEFAULT.log_config_append }}
- name: aodh-etc
mountPath: {{ .Values.conf.aodh.DEFAULT.log_config_append }}
subPath: {{ base .Values.conf.aodh.DEFAULT.log_config_append }}
readOnly: true
+ {{- end }}
- name: aodh-etc
mountPath: /etc/aodh/policy.json
subPath: policy.json
diff --git a/aodh/templates/deployment-listener.yaml b/aodh/templates/deployment-listener.yaml
index 794c780b30..27571a9fe1 100644
--- a/aodh/templates/deployment-listener.yaml
+++ b/aodh/templates/deployment-listener.yaml
@@ -77,10 +77,12 @@ spec:
mountPath: /etc/aodh/aodh.conf
subPath: aodh.conf
readOnly: true
+ {{- if .Values.conf.aodh.DEFAULT.log_config_append }}
- name: aodh-etc
mountPath: {{ .Values.conf.aodh.DEFAULT.log_config_append }}
subPath: {{ base .Values.conf.aodh.DEFAULT.log_config_append }}
readOnly: true
+ {{- end }}
- name: aodh-etc
mountPath: /etc/aodh/policy.json
subPath: policy.json
diff --git a/aodh/templates/deployment-notifier.yaml b/aodh/templates/deployment-notifier.yaml
index 9a28c144bb..77ce7fbd91 100644
--- a/aodh/templates/deployment-notifier.yaml
+++ b/aodh/templates/deployment-notifier.yaml
@@ -77,10 +77,12 @@ spec:
mountPath: /etc/aodh/aodh.conf
subPath: aodh.conf
readOnly: true
+ {{- if .Values.conf.aodh.DEFAULT.log_config_append }}
- name: aodh-etc
mountPath: {{ .Values.conf.aodh.DEFAULT.log_config_append }}
subPath: {{ base .Values.conf.aodh.DEFAULT.log_config_append }}
readOnly: true
+ {{- end }}
- name: aodh-etc
mountPath: /etc/aodh/policy.json
subPath: policy.json
diff --git a/barbican/templates/deployment-api.yaml b/barbican/templates/deployment-api.yaml
index 79474d6898..9e50c19717 100644
--- a/barbican/templates/deployment-api.yaml
+++ b/barbican/templates/deployment-api.yaml
@@ -87,10 +87,12 @@ spec:
mountPath: /etc/barbican/barbican.conf
subPath: barbican.conf
readOnly: true
+ {{- if .Values.conf.barbican.DEFAULT.log_config_append }}
- name: barbican-etc
mountPath: {{ .Values.conf.barbican.DEFAULT.log_config_append }}
subPath: {{ base .Values.conf.barbican.DEFAULT.log_config_append }}
readOnly: true
+ {{- end }}
- name: barbican-etc
mountPath: /etc/barbican/api_audit_map.conf
subPath: api_audit_map.conf
diff --git a/cinder/templates/cron-job-cinder-volume-usage-audit.yaml b/cinder/templates/cron-job-cinder-volume-usage-audit.yaml
index f7ecb3fecc..026467310d 100644
--- a/cinder/templates/cron-job-cinder-volume-usage-audit.yaml
+++ b/cinder/templates/cron-job-cinder-volume-usage-audit.yaml
@@ -68,10 +68,12 @@ spec:
mountPath: /etc/cinder/cinder.conf
subPath: cinder.conf
readOnly: true
+ {{- if .Values.conf.cinder.DEFAULT.log_config_append }}
- name: cinder-etc
mountPath: {{ .Values.conf.cinder.DEFAULT.log_config_append }}
subPath: {{ base .Values.conf.cinder.DEFAULT.log_config_append }}
readOnly: true
+ {{- end }}
- name: cinder-bin
mountPath: /tmp/volume-usage-audit.sh
subPath: volume-usage-audit.sh
diff --git a/cinder/templates/deployment-api.yaml b/cinder/templates/deployment-api.yaml
index 3692903852..58bf6b2d36 100644
--- a/cinder/templates/deployment-api.yaml
+++ b/cinder/templates/deployment-api.yaml
@@ -110,10 +110,12 @@ spec:
mountPath: /etc/cinder/cinder.conf
subPath: cinder.conf
readOnly: true
+ {{- if .Values.conf.cinder.DEFAULT.log_config_append }}
- name: cinder-etc
mountPath: {{ .Values.conf.cinder.DEFAULT.log_config_append }}
subPath: {{ base .Values.conf.cinder.DEFAULT.log_config_append }}
readOnly: true
+ {{- end }}
- name: cinder-etc
mountPath: /etc/cinder/api-paste.ini
subPath: api-paste.ini
diff --git a/cinder/templates/deployment-backup.yaml b/cinder/templates/deployment-backup.yaml
index 0d67b7c020..89a824653e 100644
--- a/cinder/templates/deployment-backup.yaml
+++ b/cinder/templates/deployment-backup.yaml
@@ -156,10 +156,12 @@ spec:
mountPath: /etc/cinder/cinder.conf
subPath: cinder.conf
readOnly: true
+ {{- if .Values.conf.cinder.DEFAULT.log_config_append }}
- name: cinder-etc
mountPath: {{ .Values.conf.cinder.DEFAULT.log_config_append }}
subPath: {{ base .Values.conf.cinder.DEFAULT.log_config_append }}
readOnly: true
+ {{- end }}
{{ if or (eq .Values.conf.cinder.DEFAULT.backup_driver "cinder.backup.drivers.ceph") (include "cinder.utils.is_ceph_volume_configured" $envAll) }}
- name: etcceph
mountPath: /etc/ceph
diff --git a/cinder/templates/deployment-scheduler.yaml b/cinder/templates/deployment-scheduler.yaml
index 7aa9898c6b..06fc3d906b 100644
--- a/cinder/templates/deployment-scheduler.yaml
+++ b/cinder/templates/deployment-scheduler.yaml
@@ -88,10 +88,12 @@ spec:
mountPath: /etc/cinder/cinder.conf
subPath: cinder.conf
readOnly: true
+ {{- if .Values.conf.cinder.DEFAULT.log_config_append }}
- name: cinder-etc
mountPath: {{ .Values.conf.cinder.DEFAULT.log_config_append }}
subPath: {{ base .Values.conf.cinder.DEFAULT.log_config_append }}
readOnly: true
+ {{- end }}
- name: cinder-etc
mountPath: /etc/cinder/api-paste.ini
subPath: api-paste.ini
diff --git a/cinder/templates/deployment-volume.yaml b/cinder/templates/deployment-volume.yaml
index 711cf76f66..fcabd0fc13 100644
--- a/cinder/templates/deployment-volume.yaml
+++ b/cinder/templates/deployment-volume.yaml
@@ -143,10 +143,12 @@ spec:
mountPath: /etc/cinder/cinder.conf
subPath: cinder.conf
readOnly: true
+ {{- if .Values.conf.cinder.DEFAULT.log_config_append }}
- name: cinder-etc
mountPath: {{ .Values.conf.cinder.DEFAULT.log_config_append }}
subPath: {{ base .Values.conf.cinder.DEFAULT.log_config_append }}
readOnly: true
+ {{- end }}
- name: cinder-etc
mountPath: /etc/cinder/conf/backends.conf
subPath: backends.conf
diff --git a/congress/templates/deployment-api.yaml b/congress/templates/deployment-api.yaml
index c5f44a6d42..882a219ed4 100644
--- a/congress/templates/deployment-api.yaml
+++ b/congress/templates/deployment-api.yaml
@@ -77,10 +77,12 @@ spec:
mountPath: /etc/congress/congress.conf
subPath: congress.conf
readOnly: true
+ {{- if .Values.conf.congress.DEFAULT.log_config_append }}
- name: congress-etc
mountPath: {{ .Values.conf.congress.DEFAULT.log_config_append }}
subPath: {{ base .Values.conf.congress.DEFAULT.log_config_append }}
readOnly: true
+ {{- end }}
- name: congress-etc
mountPath: /etc/congress/api-paste.ini
subPath: api-paste.ini
diff --git a/congress/templates/deployment-datasource.yaml b/congress/templates/deployment-datasource.yaml
index ffe0389e25..f2e31ed310 100644
--- a/congress/templates/deployment-datasource.yaml
+++ b/congress/templates/deployment-datasource.yaml
@@ -71,10 +71,12 @@ spec:
mountPath: /etc/congress/congress.conf
subPath: congress.conf
readOnly: true
+ {{- if .Values.conf.congress.DEFAULT.log_config_append }}
- name: congress-etc
mountPath: {{ .Values.conf.congress.DEFAULT.log_config_append }}
subPath: {{ base .Values.conf.congress.DEFAULT.log_config_append }}
readOnly: true
+ {{- end }}
- name: congress-etc
mountPath: /etc/congress/api-paste.ini
subPath: api-paste.ini
diff --git a/congress/templates/deployment-policy-engine.yaml b/congress/templates/deployment-policy-engine.yaml
index 6fdb04a057..5e6927598f 100644
--- a/congress/templates/deployment-policy-engine.yaml
+++ b/congress/templates/deployment-policy-engine.yaml
@@ -71,10 +71,12 @@ spec:
mountPath: /etc/congress/congress.conf
subPath: congress.conf
readOnly: true
+ {{- if .Values.conf.congress.DEFAULT.log_config_append }}
- name: congress-etc
mountPath: {{ .Values.conf.congress.DEFAULT.log_config_append }}
subPath: {{ base .Values.conf.congress.DEFAULT.log_config_append }}
readOnly: true
+ {{- end }}
- name: congress-etc
mountPath: /etc/congress/api-paste.ini
subPath: api-paste.ini
diff --git a/glance/templates/deployment-api.yaml b/glance/templates/deployment-api.yaml
index 5655c3159b..26d7327765 100644
--- a/glance/templates/deployment-api.yaml
+++ b/glance/templates/deployment-api.yaml
@@ -129,10 +129,12 @@ spec:
mountPath: /etc/glance/glance-api.conf
subPath: glance-api.conf
readOnly: true
+ {{- if .Values.conf.glance.DEFAULT.log_config_append }}
- name: glance-etc
mountPath: {{ .Values.conf.glance.DEFAULT.log_config_append }}
subPath: {{ base .Values.conf.glance.DEFAULT.log_config_append }}
readOnly: true
+ {{- end }}
- name: glance-etc
mountPath: /etc/glance/glance-api-paste.ini
subPath: glance-api-paste.ini
diff --git a/glance/templates/deployment-registry.yaml b/glance/templates/deployment-registry.yaml
index fa444f9b91..05964dc16e 100644
--- a/glance/templates/deployment-registry.yaml
+++ b/glance/templates/deployment-registry.yaml
@@ -96,10 +96,12 @@ spec:
mountPath: /etc/glance/api_audit_map.conf
subPath: api_audit_map.conf
readOnly: true
+ {{- if .Values.conf.congress.DEFAULT.log_config_append }}
- name: glance-etc
mountPath: {{ .Values.conf.glance.DEFAULT.log_config_append }}
subPath: {{ base .Values.conf.glance.DEFAULT.log_config_append }}
readOnly: true
+ {{- end }}
- name: glance-etc
mountPath: /etc/glance/glance-registry-paste.ini
subPath: glance-registry-paste.ini
diff --git a/ironic/templates/deployment-api.yaml b/ironic/templates/deployment-api.yaml
index 453d4acb00..b6113bc7e0 100644
--- a/ironic/templates/deployment-api.yaml
+++ b/ironic/templates/deployment-api.yaml
@@ -126,10 +126,12 @@ spec:
mountPath: /etc/ironic/ironic.conf
subPath: ironic.conf
readOnly: true
+ {{- if .Values.conf.ironic.DEFAULT.log_config_append }}
- name: ironic-etc
mountPath: {{ .Values.conf.ironic.DEFAULT.log_config_append }}
subPath: {{ base .Values.conf.ironic.DEFAULT.log_config_append }}
readOnly: true
+ {{- end }}
- name: ironic-etc
mountPath: /etc/ironic/policy.json
subPath: policy.json
diff --git a/ironic/templates/statefulset-conductor.yaml b/ironic/templates/statefulset-conductor.yaml
index 2a4eff35d9..1135820562 100644
--- a/ironic/templates/statefulset-conductor.yaml
+++ b/ironic/templates/statefulset-conductor.yaml
@@ -174,10 +174,12 @@ spec:
mountPath: /etc/ironic/ironic.conf
subPath: ironic.conf
readOnly: true
+ {{- if .Values.conf.ironic.DEFAULT.log_config_append }}
- name: ironic-etc
mountPath: {{ .Values.conf.ironic.DEFAULT.log_config_append }}
subPath: {{ base .Values.conf.ironic.DEFAULT.log_config_append }}
readOnly: true
+ {{- end }}
- name: ironic-etc
mountPath: /etc/ironic/policy.json
subPath: policy.json
diff --git a/keystone/templates/cron-job-credential-rotate.yaml b/keystone/templates/cron-job-credential-rotate.yaml
index 6330c1abeb..d639867032 100644
--- a/keystone/templates/cron-job-credential-rotate.yaml
+++ b/keystone/templates/cron-job-credential-rotate.yaml
@@ -103,10 +103,12 @@ spec:
mountPath: /etc/keystone/keystone.conf
subPath: keystone.conf
readOnly: true
+ {{- if .Values.conf.keystone.DEFAULT.log_config_append }}
- name: keystone-etc
mountPath: {{ .Values.conf.keystone.DEFAULT.log_config_append }}
subPath: {{ base .Values.conf.keystone.DEFAULT.log_config_append }}
readOnly: true
+ {{- end }}
- name: keystone-bin
mountPath: /tmp/fernet-manage.py
subPath: fernet-manage.py
diff --git a/keystone/templates/cron-job-fernet-rotate.yaml b/keystone/templates/cron-job-fernet-rotate.yaml
index ca2d41358f..a3fe7edd9d 100644
--- a/keystone/templates/cron-job-fernet-rotate.yaml
+++ b/keystone/templates/cron-job-fernet-rotate.yaml
@@ -102,10 +102,12 @@ spec:
mountPath: /etc/keystone/keystone.conf
subPath: keystone.conf
readOnly: true
+ {{- if .Values.conf.keystone.DEFAULT.log_config_append }}
- name: keystone-etc
mountPath: {{ .Values.conf.keystone.DEFAULT.log_config_append }}
subPath: {{ base .Values.conf.keystone.DEFAULT.log_config_append }}
readOnly: true
+ {{- end }}
- name: keystone-bin
mountPath: /tmp/fernet-manage.py
subPath: fernet-manage.py
diff --git a/keystone/templates/deployment-api.yaml b/keystone/templates/deployment-api.yaml
index 28ec10f9ef..29f906a057 100644
--- a/keystone/templates/deployment-api.yaml
+++ b/keystone/templates/deployment-api.yaml
@@ -107,10 +107,12 @@ spec:
mountPath: /etc/apache2/ports.conf
subPath: ports.conf
readOnly: true
+ {{- if .Values.conf.keystone.DEFAULT.log_config_append }}
- name: keystone-etc
mountPath: {{ .Values.conf.keystone.DEFAULT.log_config_append }}
subPath: {{ base .Values.conf.keystone.DEFAULT.log_config_append }}
readOnly: true
+ {{- end }}
- name: keystone-etc
mountPath: /etc/keystone/keystone-paste.ini
subPath: keystone-paste.ini
diff --git a/keystone/templates/job-credential-setup.yaml b/keystone/templates/job-credential-setup.yaml
index e53b0c1f57..19c41b4140 100644
--- a/keystone/templates/job-credential-setup.yaml
+++ b/keystone/templates/job-credential-setup.yaml
@@ -97,10 +97,12 @@ spec:
mountPath: /etc/keystone/keystone.conf
subPath: keystone.conf
readOnly: true
+ {{- if .Values.conf.keystone.DEFAULT.log_config_append }}
- name: keystone-etc
mountPath: {{ .Values.conf.keystone.DEFAULT.log_config_append }}
subPath: {{ base .Values.conf.keystone.DEFAULT.log_config_append }}
readOnly: true
+ {{- end }}
- name: keystone-bin
mountPath: /tmp/fernet-manage.py
subPath: fernet-manage.py
diff --git a/keystone/templates/job-domain-manage.yaml b/keystone/templates/job-domain-manage.yaml
index 86ee64763a..014f598bf6 100644
--- a/keystone/templates/job-domain-manage.yaml
+++ b/keystone/templates/job-domain-manage.yaml
@@ -84,10 +84,12 @@ spec:
mountPath: /etc/keystone/keystone.conf
subPath: keystone.conf
readOnly: true
+ {{- if .Values.conf.keystone.DEFAULT.log_config_append }}
- name: keystone-etc
mountPath: {{ .Values.conf.keystone.DEFAULT.log_config_append }}
subPath: {{ base .Values.conf.keystone.DEFAULT.log_config_append }}
readOnly: true
+ {{- end }}
{{- range $k, $v := .Values.conf.ks_domains }}
- name: keystone-etc
mountPath: {{ $envAll.Values.conf.keystone.identity.domain_config_dir | default "/etc/keystonedomains" }}/keystone.{{ $k }}.json
diff --git a/keystone/templates/job-fernet-setup.yaml b/keystone/templates/job-fernet-setup.yaml
index 81093720e9..957e9d4c01 100644
--- a/keystone/templates/job-fernet-setup.yaml
+++ b/keystone/templates/job-fernet-setup.yaml
@@ -96,10 +96,12 @@ spec:
mountPath: /etc/keystone/keystone.conf
subPath: keystone.conf
readOnly: true
+ {{- if .Values.conf.keystone.DEFAULT.log_config_append }}
- name: keystone-etc
mountPath: {{ .Values.conf.keystone.DEFAULT.log_config_append }}
subPath: {{ base .Values.conf.keystone.DEFAULT.log_config_append }}
readOnly: true
+ {{- end }}
- name: keystone-bin
mountPath: /tmp/fernet-manage.py
subPath: fernet-manage.py
diff --git a/magnum/templates/deployment-api.yaml b/magnum/templates/deployment-api.yaml
index bc28b58c2c..f2865e6174 100644
--- a/magnum/templates/deployment-api.yaml
+++ b/magnum/templates/deployment-api.yaml
@@ -94,10 +94,12 @@ spec:
mountPath: /etc/magnum/magnum.conf
subPath: magnum.conf
readOnly: true
+ {{- if .Values.conf.magnum.DEFAULT.log_config_append }}
- name: magnum-etc
mountPath: {{ .Values.conf.magnum.DEFAULT.log_config_append }}
subPath: {{ base .Values.conf.magnum.DEFAULT.log_config_append }}
readOnly: true
+ {{- end }}
- name: magnum-etc
mountPath: /etc/magnum/api-paste.ini
subPath: api-paste.ini
diff --git a/magnum/templates/statefulset-conductor.yaml b/magnum/templates/statefulset-conductor.yaml
index 20a6c9541e..28ca563c14 100644
--- a/magnum/templates/statefulset-conductor.yaml
+++ b/magnum/templates/statefulset-conductor.yaml
@@ -94,10 +94,12 @@ spec:
mountPath: /etc/magnum/magnum.conf
subPath: magnum.conf
readOnly: true
+ {{- if .Values.conf.magnum.DEFAULT.log_config_append }}
- name: magnum-etc
mountPath: {{ .Values.conf.magnum.DEFAULT.log_config_append }}
subPath: {{ base .Values.conf.magnum.DEFAULT.log_config_append }}
readOnly: true
+ {{- end }}
- name: magnum-etc
mountPath: /etc/magnum/policy.json
subPath: policy.json
diff --git a/mistral/templates/deployment-api.yaml b/mistral/templates/deployment-api.yaml
index 9eb8029b95..d740aa7f08 100644
--- a/mistral/templates/deployment-api.yaml
+++ b/mistral/templates/deployment-api.yaml
@@ -88,10 +88,12 @@ spec:
mountPath: /etc/mistral/mistral.conf
subPath: mistral.conf
readOnly: true
+ {{- if .Values.conf.mistral.DEFAULT.log_config_append }}
- name: mistral-etc
mountPath: {{ .Values.conf.mistral.DEFAULT.log_config_append }}
subPath: {{ base .Values.conf.mistral.DEFAULT.log_config_append }}
readOnly: true
+ {{- end }}
- name: mistral-etc
mountPath: /etc/mistral/policy.json
subPath: policy.json
diff --git a/mistral/templates/deployment-executor.yaml b/mistral/templates/deployment-executor.yaml
index 0ea1a39744..fd65aec5cc 100644
--- a/mistral/templates/deployment-executor.yaml
+++ b/mistral/templates/deployment-executor.yaml
@@ -74,10 +74,12 @@ spec:
mountPath: /etc/mistral/mistral.conf
subPath: mistral.conf
readOnly: true
+ {{- if .Values.conf.mistral.DEFAULT.log_config_append }}
- name: mistral-etc
mountPath: {{ .Values.conf.mistral.DEFAULT.log_config_append }}
subPath: {{ base .Values.conf.mistral.DEFAULT.log_config_append }}
readOnly: true
+ {{- end }}
{{ if $mounts_mistral_executor.volumeMounts }}{{ toYaml $mounts_mistral_executor.volumeMounts | indent 12 }}{{ end }}
volumes:
- name: pod-tmp
diff --git a/mistral/templates/statefulset-engine.yaml b/mistral/templates/statefulset-engine.yaml
index a63126ce8d..6e4cd07fa1 100644
--- a/mistral/templates/statefulset-engine.yaml
+++ b/mistral/templates/statefulset-engine.yaml
@@ -72,10 +72,12 @@ spec:
mountPath: /etc/mistral/mistral.conf
subPath: mistral.conf
readOnly: true
+ {{- if .Values.conf.mistral.DEFAULT.log_config_append }}
- name: mistral-etc
mountPath: {{ .Values.conf.mistral.DEFAULT.log_config_append }}
subPath: {{ base .Values.conf.mistral.DEFAULT.log_config_append }}
readOnly: true
+ {{- end }}
{{ if $mounts_mistral_engine.volumeMounts }}{{ toYaml $mounts_mistral_engine.volumeMounts | indent 12 }}{{ end }}
volumes:
- name: pod-tmp
diff --git a/mistral/templates/statefulset-event-engine.yaml b/mistral/templates/statefulset-event-engine.yaml
index 7013be126b..fa39f62ac6 100644
--- a/mistral/templates/statefulset-event-engine.yaml
+++ b/mistral/templates/statefulset-event-engine.yaml
@@ -72,10 +72,12 @@ spec:
mountPath: /etc/mistral/mistral.conf
subPath: mistral.conf
readOnly: true
+ {{- if .Values.conf.mistral.DEFAULT.log_config_append }}
- name: mistral-etc
mountPath: {{ .Values.conf.mistral.DEFAULT.log_config_append }}
subPath: {{ base .Values.conf.mistral.DEFAULT.log_config_append }}
readOnly: true
+ {{- end }}
{{ if $mounts_mistral_event_engine.volumeMounts }}{{ toYaml $mounts_mistral_event_engine.volumeMounts | indent 12 }}{{ end }}
volumes:
- name: pod-tmp
diff --git a/neutron/templates/daemonset-dhcp-agent.yaml b/neutron/templates/daemonset-dhcp-agent.yaml
index f60bf03f54..f4e759a0ab 100644
--- a/neutron/templates/daemonset-dhcp-agent.yaml
+++ b/neutron/templates/daemonset-dhcp-agent.yaml
@@ -112,10 +112,12 @@ spec:
mountPath: /etc/neutron/neutron.conf
subPath: neutron.conf
readOnly: true
+ {{- if .Values.conf.neutron.DEFAULT.log_config_append }}
- name: neutron-etc
mountPath: {{ .Values.conf.neutron.DEFAULT.log_config_append }}
subPath: {{ base .Values.conf.neutron.DEFAULT.log_config_append }}
readOnly: true
+ {{- end }}
- name: neutron-etc
mountPath: /etc/neutron/plugins/ml2/ml2_conf.ini
subPath: ml2_conf.ini
diff --git a/neutron/templates/daemonset-l3-agent.yaml b/neutron/templates/daemonset-l3-agent.yaml
index cd5f2495fa..fb79a94a88 100644
--- a/neutron/templates/daemonset-l3-agent.yaml
+++ b/neutron/templates/daemonset-l3-agent.yaml
@@ -112,10 +112,12 @@ spec:
mountPath: /etc/neutron/neutron.conf
subPath: neutron.conf
readOnly: true
+ {{- if .Values.conf.neutron.DEFAULT.log_config_append }}
- name: neutron-etc
mountPath: {{ .Values.conf.neutron.DEFAULT.log_config_append }}
subPath: {{ base .Values.conf.neutron.DEFAULT.log_config_append }}
readOnly: true
+ {{- end }}
- name: neutron-etc
mountPath: /etc/neutron/plugins/ml2/ml2_conf.ini
subPath: ml2_conf.ini
diff --git a/neutron/templates/daemonset-lb-agent.yaml b/neutron/templates/daemonset-lb-agent.yaml
index 69050e2bec..8f6889f6a8 100644
--- a/neutron/templates/daemonset-lb-agent.yaml
+++ b/neutron/templates/daemonset-lb-agent.yaml
@@ -161,10 +161,12 @@ spec:
mountPath: /etc/neutron/neutron.conf
subPath: neutron.conf
readOnly: true
+ {{- if .Values.conf.neutron.DEFAULT.log_config_append }}
- name: neutron-etc
mountPath: {{ .Values.conf.neutron.DEFAULT.log_config_append }}
subPath: {{ base .Values.conf.neutron.DEFAULT.log_config_append }}
readOnly: true
+ {{- end }}
- name: neutron-etc
mountPath: /etc/neutron/plugins/ml2/ml2_conf.ini
subPath: ml2_conf.ini
diff --git a/neutron/templates/daemonset-metadata-agent.yaml b/neutron/templates/daemonset-metadata-agent.yaml
index 69c4a68d74..fbc8b41775 100644
--- a/neutron/templates/daemonset-metadata-agent.yaml
+++ b/neutron/templates/daemonset-metadata-agent.yaml
@@ -131,10 +131,12 @@ spec:
mountPath: /etc/neutron/neutron.conf
subPath: neutron.conf
readOnly: true
+ {{- if .Values.conf.neutron.DEFAULT.log_config_append }}
- name: neutron-etc
mountPath: {{ .Values.conf.neutron.DEFAULT.log_config_append }}
subPath: {{ base .Values.conf.neutron.DEFAULT.log_config_append }}
readOnly: true
+ {{- end }}
- name: neutron-etc
mountPath: /etc/neutron/plugins/ml2/ml2_conf.ini
subPath: ml2_conf.ini
diff --git a/neutron/templates/daemonset-ovs-agent.yaml b/neutron/templates/daemonset-ovs-agent.yaml
index 5a4384815e..b8ca43c970 100644
--- a/neutron/templates/daemonset-ovs-agent.yaml
+++ b/neutron/templates/daemonset-ovs-agent.yaml
@@ -108,10 +108,12 @@ spec:
mountPath: /etc/neutron/plugins/ml2/openvswitch_agent.ini
subPath: openvswitch_agent.ini
readOnly: true
+ {{- if .Values.conf.neutron.DEFAULT.log_config_append }}
- name: neutron-etc
mountPath: {{ .Values.conf.neutron.DEFAULT.log_config_append }}
subPath: {{ base .Values.conf.neutron.DEFAULT.log_config_append }}
readOnly: true
+ {{- end }}
{{- if .Values.conf.plugins.taas.taas.enabled }}
- name: neutron-etc
mountPath: /etc/neutron/plugins/ml2/taas.ini
@@ -198,10 +200,12 @@ spec:
mountPath: /etc/neutron/neutron.conf
subPath: neutron.conf
readOnly: true
+ {{- if .Values.conf.neutron.DEFAULT.log_config_append }}
- name: neutron-etc
mountPath: {{ .Values.conf.neutron.DEFAULT.log_config_append }}
subPath: {{ base .Values.conf.neutron.DEFAULT.log_config_append }}
readOnly: true
+ {{- end }}
- name: neutron-etc
mountPath: /etc/neutron/plugins/ml2/ml2_conf.ini
subPath: ml2_conf.ini
diff --git a/neutron/templates/daemonset-sriov-agent.yaml b/neutron/templates/daemonset-sriov-agent.yaml
index 63471b06e0..1730990245 100644
--- a/neutron/templates/daemonset-sriov-agent.yaml
+++ b/neutron/templates/daemonset-sriov-agent.yaml
@@ -160,10 +160,12 @@ spec:
mountPath: /etc/neutron/neutron.conf
subPath: neutron.conf
readOnly: true
+ {{- if .Values.conf.neutron.DEFAULT.log_config_append }}
- name: neutron-etc
mountPath: {{ .Values.conf.neutron.DEFAULT.log_config_append }}
subPath: {{ base .Values.conf.neutron.DEFAULT.log_config_append }}
readOnly: true
+ {{- end }}
- name: neutron-etc
mountPath: /etc/neutron/plugins/ml2/ml2_conf.ini
subPath: ml2_conf.ini
diff --git a/neutron/templates/deployment-server.yaml b/neutron/templates/deployment-server.yaml
index 9dea3a925a..2f16842597 100644
--- a/neutron/templates/deployment-server.yaml
+++ b/neutron/templates/deployment-server.yaml
@@ -94,10 +94,12 @@ spec:
mountPath: /etc/neutron/neutron.conf
subPath: neutron.conf
readOnly: true
+ {{- if .Values.conf.neutron.DEFAULT.log_config_append }}
- name: neutron-etc
mountPath: {{ .Values.conf.neutron.DEFAULT.log_config_append }}
subPath: {{ base .Values.conf.neutron.DEFAULT.log_config_append }}
readOnly: true
+ {{- end }}
- name: neutron-etc
mountPath: /etc/neutron/api_audit_map.conf
subPath: api_audit_map.conf
diff --git a/nova/templates/cron-job-cell-setup.yaml b/nova/templates/cron-job-cell-setup.yaml
index 0bc457bb6e..2da4b9f8c6 100644
--- a/nova/templates/cron-job-cell-setup.yaml
+++ b/nova/templates/cron-job-cell-setup.yaml
@@ -69,10 +69,12 @@ spec:
mountPath: /etc/nova/nova.conf
subPath: nova.conf
readOnly: true
+ {{- if .Values.conf.nova.DEFAULT.log_config_append }}
- name: nova-etc
mountPath: {{ .Values.conf.nova.DEFAULT.log_config_append }}
subPath: {{ base .Values.conf.nova.DEFAULT.log_config_append }}
readOnly: true
+ {{- end }}
- name: nova-etc
mountPath: /etc/nova/policy.yaml
subPath: policy.yaml
diff --git a/nova/templates/daemonset-compute.yaml b/nova/templates/daemonset-compute.yaml
index 4363b7441f..738f59aead 100644
--- a/nova/templates/daemonset-compute.yaml
+++ b/nova/templates/daemonset-compute.yaml
@@ -232,10 +232,12 @@ spec:
mountPath: /etc/nova/nova.conf
subPath: nova.conf
readOnly: true
+ {{- if .Values.conf.nova.DEFAULT.log_config_append }}
- name: nova-etc
mountPath: {{ .Values.conf.nova.DEFAULT.log_config_append }}
subPath: {{ base .Values.conf.nova.DEFAULT.log_config_append }}
readOnly: true
+ {{- end }}
- name: nova-etc
mountPath: /etc/nova/api-paste.ini
subPath: api-paste.ini
diff --git a/nova/templates/deployment-api-metadata.yaml b/nova/templates/deployment-api-metadata.yaml
index e5b8233ad2..a78431fb63 100644
--- a/nova/templates/deployment-api-metadata.yaml
+++ b/nova/templates/deployment-api-metadata.yaml
@@ -120,10 +120,12 @@ spec:
mountPath: /etc/nova/nova.conf
subPath: nova.conf
readOnly: true
+ {{- if .Values.conf.nova.DEFAULT.log_config_append }}
- name: nova-etc
mountPath: {{ .Values.conf.nova.DEFAULT.log_config_append }}
subPath: {{ base .Values.conf.nova.DEFAULT.log_config_append }}
readOnly: true
+ {{- end }}
- name: nova-etc
mountPath: /etc/nova/api-paste.ini
subPath: api-paste.ini
diff --git a/nova/templates/deployment-api-osapi.yaml b/nova/templates/deployment-api-osapi.yaml
index 552201ea12..c556d7060c 100644
--- a/nova/templates/deployment-api-osapi.yaml
+++ b/nova/templates/deployment-api-osapi.yaml
@@ -92,10 +92,12 @@ spec:
mountPath: /etc/nova/nova.conf
subPath: nova.conf
readOnly: true
+ {{- if .Values.conf.nova.DEFAULT.log_config_append }}
- name: nova-etc
mountPath: {{ .Values.conf.nova.DEFAULT.log_config_append }}
subPath: {{ base .Values.conf.nova.DEFAULT.log_config_append }}
readOnly: true
+ {{- end }}
- name: nova-etc
mountPath: /etc/nova/api-paste.ini
subPath: api-paste.ini
diff --git a/nova/templates/deployment-conductor.yaml b/nova/templates/deployment-conductor.yaml
index d47b6420d5..f927afa6ae 100644
--- a/nova/templates/deployment-conductor.yaml
+++ b/nova/templates/deployment-conductor.yaml
@@ -101,10 +101,12 @@ spec:
mountPath: /etc/nova/nova.conf
subPath: nova.conf
readOnly: true
+ {{- if .Values.conf.nova.DEFAULT.log_config_append }}
- name: nova-etc
mountPath: {{ .Values.conf.nova.DEFAULT.log_config_append }}
subPath: {{ base .Values.conf.nova.DEFAULT.log_config_append }}
readOnly: true
+ {{- end }}
- name: nova-etc
mountPath: /etc/nova/policy.yaml
subPath: policy.yaml
diff --git a/nova/templates/deployment-consoleauth.yaml b/nova/templates/deployment-consoleauth.yaml
index 0ecf60bdf7..b9cb71732e 100644
--- a/nova/templates/deployment-consoleauth.yaml
+++ b/nova/templates/deployment-consoleauth.yaml
@@ -101,10 +101,12 @@ spec:
mountPath: /etc/nova/nova.conf
subPath: nova.conf
readOnly: true
+ {{- if .Values.conf.nova.DEFAULT.log_config_append }}
- name: nova-etc
mountPath: {{ .Values.conf.nova.DEFAULT.log_config_append }}
subPath: {{ base .Values.conf.nova.DEFAULT.log_config_append }}
readOnly: true
+ {{- end }}
- name: nova-etc
mountPath: /etc/nova/policy.yaml
subPath: policy.yaml
diff --git a/nova/templates/deployment-novncproxy.yaml b/nova/templates/deployment-novncproxy.yaml
index e828a42f32..f3b95b6f73 100644
--- a/nova/templates/deployment-novncproxy.yaml
+++ b/nova/templates/deployment-novncproxy.yaml
@@ -73,10 +73,12 @@ spec:
mountPath: /etc/nova/nova.conf
subPath: nova.conf
readOnly: true
+ {{- if .Values.conf.nova.DEFAULT.log_config_append }}
- name: nova-etc
mountPath: {{ .Values.conf.nova.DEFAULT.log_config_append }}
subPath: {{ base .Values.conf.nova.DEFAULT.log_config_append }}
readOnly: true
+ {{- end }}
- name: pod-shared
mountPath: /tmp/pod-shared
- name: nova-novncproxy-init-assets
diff --git a/nova/templates/deployment-placement.yaml b/nova/templates/deployment-placement.yaml
index 555afd1ef6..cd02da6012 100644
--- a/nova/templates/deployment-placement.yaml
+++ b/nova/templates/deployment-placement.yaml
@@ -94,10 +94,12 @@ spec:
mountPath: /etc/nova/nova.conf
subPath: nova.conf
readOnly: true
+ {{- if .Values.conf.nova.DEFAULT.log_config_append }}
- name: nova-etc
mountPath: {{ .Values.conf.nova.DEFAULT.log_config_append }}
subPath: {{ base .Values.conf.nova.DEFAULT.log_config_append }}
readOnly: true
+ {{- end }}
- name: nova-etc
mountPath: /etc/nova/api-paste.ini
subPath: api-paste.ini
diff --git a/nova/templates/deployment-scheduler.yaml b/nova/templates/deployment-scheduler.yaml
index c3ee761beb..05ee94923d 100644
--- a/nova/templates/deployment-scheduler.yaml
+++ b/nova/templates/deployment-scheduler.yaml
@@ -103,10 +103,12 @@ spec:
mountPath: /etc/nova/nova.conf
subPath: nova.conf
readOnly: true
+ {{- if .Values.conf.nova.DEFAULT.log_config_append }}
- name: nova-etc
mountPath: {{ .Values.conf.nova.DEFAULT.log_config_append }}
subPath: {{ base .Values.conf.nova.DEFAULT.log_config_append }}
readOnly: true
+ {{- end }}
- name: nova-etc
mountPath: /etc/nova/policy.yaml
subPath: policy.yaml
diff --git a/nova/templates/deployment-spiceproxy.yaml b/nova/templates/deployment-spiceproxy.yaml
index 402b03d68e..a221656e31 100644
--- a/nova/templates/deployment-spiceproxy.yaml
+++ b/nova/templates/deployment-spiceproxy.yaml
@@ -73,10 +73,12 @@ spec:
mountPath: /etc/nova/nova.conf
subPath: nova.conf
readOnly: true
+ {{- if .Values.conf.nova.DEFAULT.log_config_append }}
- name: nova-etc
mountPath: {{ .Values.conf.nova.DEFAULT.log_config_append }}
subPath: {{ base .Values.conf.nova.DEFAULT.log_config_append }}
readOnly: true
+ {{- end }}
- name: pod-shared
mountPath: /tmp/pod-shared
- name: nova-spiceproxy-init-assets
@@ -123,10 +125,12 @@ spec:
mountPath: /etc/nova/nova.conf
subPath: nova.conf
readOnly: true
+ {{- if .Values.conf.nova.DEFAULT.log_config_append }}
- name: nova-etc
mountPath: {{ .Values.conf.nova.DEFAULT.log_config_append }}
subPath: {{ base .Values.conf.nova.DEFAULT.log_config_append }}
readOnly: true
+ {{- end }}
- name: pod-usr-share-spice-html5
mountPath: /usr/share/spice-html5
readOnly: true
diff --git a/nova/templates/job-cell-setup.yaml b/nova/templates/job-cell-setup.yaml
index be42b6f8a1..7ebd48bac4 100644
--- a/nova/templates/job-cell-setup.yaml
+++ b/nova/templates/job-cell-setup.yaml
@@ -73,10 +73,12 @@ spec:
mountPath: /etc/nova/nova.conf
subPath: nova.conf
readOnly: true
+ {{- if .Values.conf.nova.DEFAULT.log_config_append }}
- name: nova-etc
mountPath: {{ .Values.conf.nova.DEFAULT.log_config_append }}
subPath: {{ base .Values.conf.nova.DEFAULT.log_config_append }}
readOnly: true
+ {{- end }}
- name: nova-etc
mountPath: /etc/nova/policy.yaml
subPath: policy.yaml
diff --git a/nova/templates/statefulset-compute-ironic.yaml b/nova/templates/statefulset-compute-ironic.yaml
index 1814536abe..44c2b5e677 100644
--- a/nova/templates/statefulset-compute-ironic.yaml
+++ b/nova/templates/statefulset-compute-ironic.yaml
@@ -77,10 +77,12 @@ spec:
mountPath: /etc/nova/nova.conf
subPath: nova.conf
readOnly: true
+ {{- if .Values.conf.nova.DEFAULT.log_config_append }}
- name: nova-etc
mountPath: {{ .Values.conf.nova.DEFAULT.log_config_append }}
subPath: {{ base .Values.conf.nova.DEFAULT.log_config_append }}
readOnly: true
+ {{- end }}
- name: nova-etc
mountPath: /etc/nova/nova-ironic.conf
subPath: nova-ironic.conf
diff --git a/panko/templates/cron-job-events-cleaner.yaml b/panko/templates/cron-job-events-cleaner.yaml
index ac7a47ad9e..a4042424b5 100644
--- a/panko/templates/cron-job-events-cleaner.yaml
+++ b/panko/templates/cron-job-events-cleaner.yaml
@@ -66,10 +66,12 @@ spec:
mountPath: /etc/panko/panko.conf
subPath: panko.conf
readOnly: true
+ {{- if .Values.conf.panko.DEFAULT.log_config_append }}
- name: panko-etc
mountPath: {{ .Values.conf.panko.DEFAULT.log_config_append }}
subPath: {{ base .Values.conf.panko.DEFAULT.log_config_append }}
readOnly: true
+ {{- end }}
{{ if $mounts_panko_events_cleaner.volumeMounts }}{{ toYaml $mounts_panko_events_cleaner.volumeMounts | indent 16 }}{{ end }}
volumes:
- name: pod-tmp
diff --git a/panko/templates/deployment-api.yaml b/panko/templates/deployment-api.yaml
index b1556d28ec..bf8b167436 100644
--- a/panko/templates/deployment-api.yaml
+++ b/panko/templates/deployment-api.yaml
@@ -86,10 +86,12 @@ spec:
mountPath: /etc/panko/panko.conf
subPath: panko.conf
readOnly: true
+ {{- if .Values.conf.panko.DEFAULT.log_config_append }}
- name: panko-etc
mountPath: {{ .Values.conf.panko.DEFAULT.log_config_append }}
subPath: {{ base .Values.conf.panko.DEFAULT.log_config_append }}
readOnly: true
+ {{- end }}
- name: panko-etc
mountPath: /etc/panko/api_paste.ini
subPath: api_paste.ini
diff --git a/senlin/templates/cron-job-engine-cleaner.yaml b/senlin/templates/cron-job-engine-cleaner.yaml
index cede0dbd40..6f9eec7134 100644
--- a/senlin/templates/cron-job-engine-cleaner.yaml
+++ b/senlin/templates/cron-job-engine-cleaner.yaml
@@ -69,10 +69,12 @@ spec:
mountPath: /etc/senlin/senlin.conf
subPath: senlin.conf
readOnly: true
+ {{- if .Values.conf.senlin.DEFAULT.log_config_append }}
- name: senlin-etc
mountPath: {{ .Values.conf.senlin.DEFAULT.log_config_append }}
subPath: {{ base .Values.conf.senlin.DEFAULT.log_config_append }}
readOnly: true
+ {{- end }}
{{ if $mounts_senlin_engine_cleaner.volumeMounts }}{{ toYaml $mounts_senlin_engine_cleaner.volumeMounts | indent 16 }}{{ end }}
volumes:
- name: pod-tmp
diff --git a/senlin/templates/deployment-api.yaml b/senlin/templates/deployment-api.yaml
index b0319c0b29..2b48d506ff 100644
--- a/senlin/templates/deployment-api.yaml
+++ b/senlin/templates/deployment-api.yaml
@@ -94,10 +94,12 @@ spec:
mountPath: /etc/senlin/senlin.conf
subPath: senlin.conf
readOnly: true
+ {{- if .Values.conf.senlin.DEFAULT.log_config_append }}
- name: senlin-etc
mountPath: {{ .Values.conf.senlin.DEFAULT.log_config_append }}
subPath: {{ base .Values.conf.senlin.DEFAULT.log_config_append }}
readOnly: true
+ {{- end }}
- name: senlin-etc
mountPath: /etc/senlin/api-paste.ini
subPath: api-paste.ini
diff --git a/senlin/templates/deployment-engine.yaml b/senlin/templates/deployment-engine.yaml
index 0cc6518d9f..f5baa94c5a 100644
--- a/senlin/templates/deployment-engine.yaml
+++ b/senlin/templates/deployment-engine.yaml
@@ -73,10 +73,12 @@ spec:
mountPath: /etc/senlin/senlin.conf
subPath: senlin.conf
readOnly: true
+ {{- if .Values.conf.senlin.DEFAULT.log_config_append }}
- name: senlin-etc
mountPath: {{ .Values.conf.senlin.DEFAULT.log_config_append }}
subPath: {{ base .Values.conf.senlin.DEFAULT.log_config_append }}
readOnly: true
+ {{- end }}
- name: senlin-etc
mountPath: /etc/senlin/policy.json
subPath: policy.json