From fea453ba7284ee65d99580231a483561be84a083 Mon Sep 17 00:00:00 2001 From: Larry Rensing Date: Wed, 26 Apr 2017 15:22:17 +0000 Subject: [PATCH] Consolidate volumes across charts This PS standardizes configmap mounts across all charts to be named -etc or -bin. This reduces the amount of volumes listed in each file. Change-Id: Idbaf495fa243bb9ea0f6ad755ca4f899d5fc0d6f --- cinder/templates/deployment-api.yaml | 14 ++--- cinder/templates/deployment-scheduler.yaml | 14 ++--- cinder/templates/deployment-volume.yaml | 14 ++--- cinder/templates/job-db-init.yaml | 4 +- cinder/templates/job-db-sync.yaml | 4 +- glance/templates/deployment-api.yaml | 25 ++------ glance/templates/deployment-registry.yaml | 14 ++--- glance/templates/job-bootstrap.yaml | 8 +-- glance/templates/job-db-init.yaml | 4 +- glance/templates/job-db-sync.yaml | 4 +- heat/templates/deployment-api.yaml | 18 ++---- heat/templates/deployment-cfn.yaml | 18 ++---- heat/templates/deployment-cloudwatch.yaml | 18 ++---- heat/templates/job-db-init.yaml | 4 +- heat/templates/job-db-sync.yaml | 4 +- heat/templates/statefulset-engine.yaml | 13 ++--- horizon/templates/deployment.yaml | 11 ++-- ingress/templates/ingress-deployment.yaml | 4 +- mariadb/templates/deployment.yaml | 58 +++++-------------- mariadb/templates/job-seed.yaml | 53 +++++------------ mistral/templates/deployment-api.yaml | 9 +-- mistral/templates/deployment-executor.yaml | 4 +- mistral/templates/job-db-init.yaml | 4 +- mistral/templates/job-db-sync.yaml | 8 +-- mistral/templates/statefulset-engine.yaml | 4 +- .../templates/statefulset-event-engine.yaml | 4 +- neutron/templates/daemonset-ovs-db.yaml | 10 ++-- neutron/templates/job-db-init.yaml | 4 +- neutron/templates/job-db-sync.yaml | 6 +- nova/templates/job-bootstrap.yaml | 4 +- nova/templates/job-db-init.yaml | 6 +- nova/templates/job-db-sync.yaml | 4 +- 32 files changed, 126 insertions(+), 247 deletions(-) diff --git a/cinder/templates/deployment-api.yaml b/cinder/templates/deployment-api.yaml index 76695720cd..8dcaca9a56 100644 --- a/cinder/templates/deployment-api.yaml +++ b/cinder/templates/deployment-api.yaml @@ -69,15 +69,15 @@ spec: mountPath: /etc/cinder - name: pod-var-cache-cinder mountPath: /var/cache/cinder - - name: cinderconf + - name: cinder-etc mountPath: /etc/cinder/conf/cinder.conf subPath: cinder.conf readOnly: true - - name: cinderpaste + - name: cinder-etc mountPath: /etc/cinder/api-paste.ini subPath: api-paste.ini readOnly: true - - name: cinderpolicy + - name: cinder-etc mountPath: /etc/cinder/policy.json subPath: policy.json readOnly: true @@ -86,12 +86,6 @@ spec: emptyDir: {} - name: pod-var-cache-cinder emptyDir: {} - - name: cinderconf - configMap: - name: cinder-etc - - name: cinderpaste - configMap: - name: cinder-etc - - name: cinderpolicy + - name: cinder-etc configMap: name: cinder-etc diff --git a/cinder/templates/deployment-scheduler.yaml b/cinder/templates/deployment-scheduler.yaml index 66d6b06331..37decd4f0c 100644 --- a/cinder/templates/deployment-scheduler.yaml +++ b/cinder/templates/deployment-scheduler.yaml @@ -63,15 +63,15 @@ spec: mountPath: /etc/cinder - name: pod-var-cache-cinder mountPath: /var/cache/cinder - - name: cinderconf + - name: cinder-etc mountPath: /etc/cinder/conf/cinder.conf subPath: cinder.conf readOnly: true - - name: cinderpaste + - name: cinder-etc mountPath: /etc/cinder/api-paste.ini subPath: api-paste.ini readOnly: true - - name: cinderpolicy + - name: cinder-etc mountPath: /etc/cinder/policy.json subPath: policy.json readOnly: true @@ -80,12 +80,6 @@ spec: emptyDir: {} - name: pod-var-cache-cinder emptyDir: {} - - name: cinderconf - configMap: - name: cinder-etc - - name: cinderpaste - configMap: - name: cinder-etc - - name: cinderpolicy + - name: cinder-etc configMap: name: cinder-etc diff --git a/cinder/templates/deployment-volume.yaml b/cinder/templates/deployment-volume.yaml index dc07256927..9021de54b5 100644 --- a/cinder/templates/deployment-volume.yaml +++ b/cinder/templates/deployment-volume.yaml @@ -63,15 +63,15 @@ spec: mountPath: /etc/cinder - name: pod-var-cache-cinder mountPath: /var/cache/cinder - - name: cinderconf + - name: cinder-etc mountPath: /etc/cinder/conf/cinder.conf subPath: cinder.conf readOnly: true - - name: cephconf + - name: cinder-etc mountPath: /etc/ceph/ceph.conf subPath: ceph.conf readOnly: true - - name: cephclientcinderkeyring + - name: cinder-etc mountPath: /etc/ceph/ceph.client.{{ .Values.ceph.cinder_user }}.keyring subPath: ceph.client.{{ .Values.ceph.cinder_user }}.keyring readOnly: true @@ -80,12 +80,6 @@ spec: emptyDir: {} - name: pod-var-cache-cinder emptyDir: {} - - name: cinderconf - configMap: - name: cinder-etc - - name: cephconf - configMap: - name: cinder-etc - - name: cephclientcinderkeyring + - name: cinder-etc configMap: name: cinder-etc diff --git a/cinder/templates/job-db-init.yaml b/cinder/templates/job-db-init.yaml index bbc079e369..9c1b1c1b50 100644 --- a/cinder/templates/job-db-init.yaml +++ b/cinder/templates/job-db-init.yaml @@ -64,14 +64,14 @@ spec: readOnly: true - name: etccinder mountPath: /etc/cinder - - name: cinderconf + - name: cinder-etc mountPath: /etc/cinder/cinder.conf subPath: cinder.conf readOnly: true volumes: - name: etccinder emptyDir: {} - - name: cinderconf + - name: cinder-etc configMap: name: cinder-etc - name: cinder-bin diff --git a/cinder/templates/job-db-sync.yaml b/cinder/templates/job-db-sync.yaml index 71d2a92a5b..641072bfb7 100644 --- a/cinder/templates/job-db-sync.yaml +++ b/cinder/templates/job-db-sync.yaml @@ -52,14 +52,14 @@ spec: readOnly: true - name: etccinder mountPath: /etc/cinder - - name: cinderapiconf + - name: cinder-etc mountPath: /etc/cinder/cinder.conf subPath: cinder.conf readOnly: true volumes: - name: etccinder emptyDir: {} - - name: cinderapiconf + - name: cinder-etc configMap: name: cinder-etc - name: cinder-bin diff --git a/glance/templates/deployment-api.yaml b/glance/templates/deployment-api.yaml index 104d3eee26..e10ed317d8 100644 --- a/glance/templates/deployment-api.yaml +++ b/glance/templates/deployment-api.yaml @@ -66,15 +66,15 @@ spec: volumeMounts: - name: etcglance mountPath: /etc/glance - - name: glanceapiconf + - name: glance-etc mountPath: /etc/glance/glance-api.conf subPath: glance-api.conf readOnly: true - - name: glanceapipaste + - name: glance-etc mountPath: /etc/glance/glance-api-paste.ini subPath: glance-api-paste.ini readOnly: true - - name: glancepolicy + - name: glance-etc mountPath: /etc/glance/policy.json subPath: policy.json readOnly: true @@ -82,36 +82,23 @@ spec: - name: glance-images mountPath: {{ .Values.conf.glance.glance_store.glance.store.filesystem_store_datadir }} {{- else }} - - name: cephconf + - name: glance-etc mountPath: /etc/ceph/ceph.conf subPath: ceph.conf readOnly: true - - name: cephclientglancekeyring + - name: glance-etc mountPath: /etc/ceph/ceph.client.{{ .Values.ceph.glance_user }}.keyring subPath: ceph.client.{{ .Values.ceph.glance_user }}.keyring readOnly: true {{- end }} volumes: - - name: glanceapiconf - configMap: - name: glance-etc - - name: glanceapipaste + - name: glance-etc configMap: name: glance-etc {{- if eq .Values.storage "file" }} - name: glance-images persistentVolumeClaim: claimName: glance-images -{{- else }} - - name: cephconf - configMap: - name: glance-etc - - name: cephclientglancekeyring - configMap: - name: glance-etc {{- end }} - name: etcglance emptyDir: {} - - name: glancepolicy - configMap: - name: glance-etc diff --git a/glance/templates/deployment-registry.yaml b/glance/templates/deployment-registry.yaml index 2c03dbe778..0985ae68d9 100644 --- a/glance/templates/deployment-registry.yaml +++ b/glance/templates/deployment-registry.yaml @@ -58,27 +58,21 @@ spec: volumeMounts: - name: etcglance mountPath: /etc/glance - - name: glanceregistryconf + - name: glance-etc mountPath: /etc/glance/glance-registry.conf subPath: glance-registry.conf readOnly: true - - name: glanceregistrypaste + - name: glance-etc mountPath: /etc/glance/glance-registry-paste.ini subPath: glance-registry-paste.ini readOnly: true - - name: glancepolicy + - name: glance-etc mountPath: /etc/glance/policy.json subPath: policy.json readOnly: true volumes: - name: etcglance emptyDir: {} - - name: glanceregistryconf - configMap: - name: glance-etc - - name: glanceregistrypaste - configMap: - name: glance-etc - - name: glancepolicy + - name: glance-etc configMap: name: glance-etc diff --git a/glance/templates/job-bootstrap.yaml b/glance/templates/job-bootstrap.yaml index f17d915256..c1a40770b2 100644 --- a/glance/templates/job-bootstrap.yaml +++ b/glance/templates/job-bootstrap.yaml @@ -53,18 +53,18 @@ spec: volumeMounts: - name: imagedir mountPath: /tmp/images - - name: bootstrapsh + - name: glance-bin mountPath: /tmp/bootstrap.sh subPath: bootstrap.sh - - name: glanceapiconf + - name: glance-etc mountPath: /etc/glance/glance-api.conf subPath: glance-api.conf volumes: - name: imagedir emptyDir: {} - - name: bootstrapsh + - name: glance-bin configMap: name: glance-bin - - name: glanceapiconf + - name: glance-etc configMap: name: glance-etc diff --git a/glance/templates/job-db-init.yaml b/glance/templates/job-db-init.yaml index 2283d4dffd..4def8db5c5 100644 --- a/glance/templates/job-db-init.yaml +++ b/glance/templates/job-db-init.yaml @@ -64,14 +64,14 @@ spec: readOnly: true - name: etcglance mountPath: /etc/glance - - name: glanceapiconf + - name: glance-etc mountPath: /etc/glance/glance-api.conf subPath: glance-api.conf readOnly: true volumes: - name: etcglance emptyDir: {} - - name: glanceapiconf + - name: glance-etc configMap: name: glance-etc - name: glance-bin diff --git a/glance/templates/job-db-sync.yaml b/glance/templates/job-db-sync.yaml index c1545f28e3..6d3c312c59 100644 --- a/glance/templates/job-db-sync.yaml +++ b/glance/templates/job-db-sync.yaml @@ -52,14 +52,14 @@ spec: readOnly: true - name: etcglance mountPath: /etc/glance - - name: glanceapiconf + - name: glance-etc mountPath: /etc/glance/glance-api.conf subPath: glance-api.conf readOnly: true volumes: - name: etcglance emptyDir: {} - - name: glanceapiconf + - name: glance-etc configMap: name: glance-etc - name: glance-bin diff --git a/heat/templates/deployment-api.yaml b/heat/templates/deployment-api.yaml index e54fd6cf2d..de6ddb331b 100644 --- a/heat/templates/deployment-api.yaml +++ b/heat/templates/deployment-api.yaml @@ -57,7 +57,7 @@ spec: command: - heat-api - --config-dir - - /etc/heat/conf + - /etc/heat ports: - containerPort: {{ .Values.conf.heat.heat_api.heat.common.wsgi.bind_port }} readinessProbe: @@ -68,15 +68,15 @@ spec: mountPath: /etc/heat - name: pod-var-cache-heat mountPath: /var/cache/heat - - name: heatconf - mountPath: /etc/heat/conf/heat.conf + - name: heat-etc + mountPath: /etc/heat/heat.conf subPath: heat.conf readOnly: true - - name: heatpaste + - name: heat-etc mountPath: /etc/heat/api-paste.ini subPath: api-paste.ini readOnly: true - - name: heatpolicy + - name: heat-etc mountPath: /etc/heat/policy.json subPath: policy.json readOnly: true @@ -86,13 +86,7 @@ spec: emptyDir: {} - name: pod-var-cache-heat emptyDir: {} - - name: heatconf - configMap: - name: heat-etc - - name: heatpaste - configMap: - name: heat-etc - - name: heatpolicy + - name: heat-etc configMap: name: heat-etc {{ if $mounts_heat_api.volumes }}{{ toYaml $mounts_heat_api.volumes | indent 8 }}{{ end }} diff --git a/heat/templates/deployment-cfn.yaml b/heat/templates/deployment-cfn.yaml index 151009918f..4e474b6f52 100644 --- a/heat/templates/deployment-cfn.yaml +++ b/heat/templates/deployment-cfn.yaml @@ -57,7 +57,7 @@ spec: command: - heat-api-cfn - --config-dir - - /etc/heat/conf + - /etc/heat ports: - containerPort: {{ .Values.conf.heat.heat_api_cfn.heat.common.wsgi.bind_port }} readinessProbe: @@ -68,15 +68,15 @@ spec: mountPath: /etc/heat - name: pod-var-cache-heat mountPath: /var/cache/heat - - name: heatconf - mountPath: /etc/heat/conf/heat.conf + - name: heat-etc + mountPath: /etc/heat/heat.conf subPath: heat.conf readOnly: true - - name: heatpaste + - name: heat-etc mountPath: /etc/heat/api-paste.ini subPath: api-paste.ini readOnly: true - - name: heatpolicy + - name: heat-etc mountPath: /etc/heat/policy.json subPath: policy.json readOnly: true @@ -86,13 +86,7 @@ spec: emptyDir: {} - name: pod-var-cache-heat emptyDir: {} - - name: heatconf - configMap: - name: heat-etc - - name: heatpaste - configMap: - name: heat-etc - - name: heatpolicy + - name: heat-etc configMap: name: heat-etc {{ if $mounts_heat_cfn.volumes }}{{ toYaml $mounts_heat_cfn.volumes | indent 8 }}{{ end }} diff --git a/heat/templates/deployment-cloudwatch.yaml b/heat/templates/deployment-cloudwatch.yaml index 21914b9fce..31c4444f87 100644 --- a/heat/templates/deployment-cloudwatch.yaml +++ b/heat/templates/deployment-cloudwatch.yaml @@ -57,7 +57,7 @@ spec: command: - heat-api-cloudwatch - --config-dir - - /etc/heat/conf + - /etc/heat ports: - containerPort: {{ .Values.conf.heat.heat_api_cloudwatch.heat.common.wsgi.bind_port }} readinessProbe: @@ -68,15 +68,15 @@ spec: mountPath: /etc/heat - name: pod-var-cache-heat mountPath: /var/cache/heat - - name: heatconf - mountPath: /etc/heat/conf/heat.conf + - name: heat-etc + mountPath: /etc/heat/heat.conf subPath: heat.conf readOnly: true - - name: heatpaste + - name: heat-etc mountPath: /etc/heat/api-paste.ini subPath: api-paste.ini readOnly: true - - name: heatpolicy + - name: heat-etc mountPath: /etc/heat/policy.json subPath: policy.json readOnly: true @@ -86,13 +86,7 @@ spec: emptyDir: {} - name: pod-var-cache-heat emptyDir: {} - - name: heatconf - configMap: - name: heat-etc - - name: heatpaste - configMap: - name: heat-etc - - name: heatpolicy + - name: heat-etc configMap: name: heat-etc {{ if $mounts_heat_cloudwatch.volumes }}{{ toYaml $mounts_heat_cloudwatch.volumes | indent 8 }}{{ end }} diff --git a/heat/templates/job-db-init.yaml b/heat/templates/job-db-init.yaml index 41edc90568..77a8b4d190 100644 --- a/heat/templates/job-db-init.yaml +++ b/heat/templates/job-db-init.yaml @@ -64,14 +64,14 @@ spec: readOnly: true - name: etcheat mountPath: /etc/heat - - name: heatapiconf + - name: heat-etc mountPath: /etc/heat/heat.conf subPath: heat.conf readOnly: true volumes: - name: etcheat emptyDir: {} - - name: heatapiconf + - name: heat-etc configMap: name: heat-etc - name: heat-bin diff --git a/heat/templates/job-db-sync.yaml b/heat/templates/job-db-sync.yaml index 5f8d340b46..001ab2345b 100644 --- a/heat/templates/job-db-sync.yaml +++ b/heat/templates/job-db-sync.yaml @@ -52,14 +52,14 @@ spec: readOnly: true - name: etcheat mountPath: /etc/heat - - name: heatapiconf + - name: heat-etc mountPath: /etc/heat/heat.conf subPath: heat.conf readOnly: true volumes: - name: etcheat emptyDir: {} - - name: heatapiconf + - name: heat-etc configMap: name: heat-etc - name: heat-bin diff --git a/heat/templates/statefulset-engine.yaml b/heat/templates/statefulset-engine.yaml index bcaead3137..7602ff3698 100644 --- a/heat/templates/statefulset-engine.yaml +++ b/heat/templates/statefulset-engine.yaml @@ -50,17 +50,17 @@ spec: command: - heat-engine - --config-dir - - /etc/heat/conf + - /etc/heat volumeMounts: - name: pod-etc-heat mountPath: /etc/heat - name: pod-var-cache-heat mountPath: /var/cache/heat - - name: heatconf - mountPath: /etc/heat/conf/heat.conf + - name: heat-etc + mountPath: /etc/heat/heat.conf subPath: heat.conf readOnly: true - - name: heatpolicy + - name: heat-etc mountPath: /etc/heat/policy.json subPath: policy.json readOnly: true @@ -70,10 +70,7 @@ spec: emptyDir: {} - name: pod-var-cache-heat emptyDir: {} - - name: heatconf - configMap: - name: heat-etc - - name: heatpolicy + - name: heat-etc configMap: name: heat-etc {{ if $mounts_heat_engine.volumes }}{{ toYaml $mounts_heat_engine.volumes | indent 8 }}{{ end }} diff --git a/horizon/templates/deployment.yaml b/horizon/templates/deployment.yaml index 57639dcf13..ae81b893c0 100644 --- a/horizon/templates/deployment.yaml +++ b/horizon/templates/deployment.yaml @@ -66,21 +66,18 @@ spec: - name: startsh mountPath: /tmp/start.sh subPath: start.sh - - name: horizonconf + - name: horizon-etc mountPath: /etc/apache2/sites-enabled/000-default.conf subPath: horizon.conf - - name: localsettings + - name: horizon-etc mountPath: /etc/openstack-dashboard/local_settings subPath: local_settings securityContext: - runAsUser: 0 + runAsUser: 0 volumes: - name: startsh configMap: name: horizon-bin - - name: horizonconf - configMap: - name: horizon-etc - - name: localsettings + - name: horizon-etc configMap: name: horizon-etc diff --git a/ingress/templates/ingress-deployment.yaml b/ingress/templates/ingress-deployment.yaml index 043f038a22..45c994fe62 100644 --- a/ingress/templates/ingress-deployment.yaml +++ b/ingress/templates/ingress-deployment.yaml @@ -84,11 +84,11 @@ spec: - '--v=3' {{- if .Values.network.host_namespace }} volumeMounts: - - name: resolvconf + - name: ingress-etc mountPath: /etc/resolv.conf subPath: resolv.conf volumes: - - name: resolvconf + - name: ingress-etc configMap: name: ingress-etc {{- end }} diff --git a/mariadb/templates/deployment.yaml b/mariadb/templates/deployment.yaml index df04d10ebf..5f7ddcd9f2 100644 --- a/mariadb/templates/deployment.yaml +++ b/mariadb/templates/deployment.yaml @@ -101,40 +101,40 @@ spec: volumeMounts: - name: mycnfd mountPath: /etc/my.cnf.d - - name: startsh + - name: mariadb-bin mountPath: /tmp/start.sh subPath: start.sh - - name: bootstrapdb + - name: mariadb-bin mountPath: /tmp/bootstrap-db.sh subPath: bootstrap-db.sh - - name: peerfinder + - name: mariadb-bin mountPath: /tmp/peer-finder.py subPath: peer-finder.py - - name: readiness + - name: mariadb-bin mountPath: /mariadb-readiness.py subPath: readiness.py - - name: charsets + - name: mariadb-etc mountPath: /etc/my.cnf.d/charsets.cnf subPath: charsets.cnf - - name: engine + - name: mariadb-etc mountPath: /etc/my.cnf.d/engine.cnf subPath: engine.cnf - - name: log + - name: mariadb-etc mountPath: /etc/my.cnf.d/log.cnf subPath: log.cnf - - name: mycnf + - name: mariadb-etc mountPath: /etc/my.cnf subPath: my.cnf - - name: networking + - name: mariadb-etc mountPath: /etc/my.cnf.d/networking.cnf subPath: networking.cnf - - name: pid + - name: mariadb-etc mountPath: /etc/my.cnf.d/pid.cnf subPath: pid.cnf - - name: tuning + - name: mariadb-etc mountPath: /etc/my.cnf.d/tuning.cnf subPath: tuning.cnf - - name: wsrep + - name: mariadb-etc mountPath: /etc/my.cnf.d/wsrep.cnf subPath: wsrep.cnf - name: mysql-data @@ -142,40 +142,10 @@ spec: volumes: - name: mycnfd emptyDir: {} - - name: startsh + - name: mariadb-bin configMap: name: mariadb-bin - - name: bootstrapdb - configMap: - name: mariadb-bin - - name: peerfinder - configMap: - name: mariadb-bin - - name: readiness - configMap: - name: mariadb-bin - - name: charsets - configMap: - name: mariadb-etc - - name: engine - configMap: - name: mariadb-etc - - name: log - configMap: - name: mariadb-etc - - name: mycnf - configMap: - name: mariadb-etc - - name: networking - configMap: - name: mariadb-etc - - name: pid - configMap: - name: mariadb-etc - - name: tuning - configMap: - name: mariadb-etc - - name: wsrep + - name: mariadb-etc configMap: name: mariadb-etc {{- if .Values.development.enabled }} diff --git a/mariadb/templates/job-seed.yaml b/mariadb/templates/job-seed.yaml index 90b49dc35a..019b6f497d 100644 --- a/mariadb/templates/job-seed.yaml +++ b/mariadb/templates/job-seed.yaml @@ -64,72 +64,45 @@ spec: volumeMounts: - name: mycnfd mountPath: /etc/my.cnf.d - - name: seedsh + - name: mariadb-bin mountPath: /tmp/seed.sh subPath: seed.sh - - name: bootstrapdb + - name: mariadb-bin mountPath: /tmp/bootstrap-db.sh subPath: bootstrap-db.sh - - name: peerfinder + - name: mariadb-bin mountPath: /tmp/peer-finder.py subPath: peer-finder.py - - name: charsets + - name: mariadb-etc mountPath: /etc/my.cnf.d/charsets.cnf subPath: charsets.cnf - - name: engine + - name: mariadb-etc mountPath: /etc/my.cnf.d/engine.cnf subPath: engine.cnf - - name: log + - name: mariadb-etc mountPath: /etc/my.cnf.d/log.cnf subPath: log.cnf - - name: mycnf + - name: mariadb-etc mountPath: /etc/my.cnf subPath: my.cnf - - name: networking + - name: mariadb-etc mountPath: /etc/my.cnf.d/networking.cnf subPath: networking.cnf - - name: pid + - name: mariadb-etc mountPath: /etc/my.cnf.d/pid.cnf subPath: pid.cnf - - name: tuning + - name: mariadb-etc mountPath: /etc/my.cnf.d/tuning.cnf subPath: tuning.cnf - - name: wsrep + - name: mariadb-etc mountPath: /etc/my.cnf.d/wsrep.cnf subPath: wsrep.cnf volumes: - name: mycnfd emptyDir: {} - - name: seedsh + - name: mariadb-bin configMap: name: mariadb-bin - - name: bootstrapdb - configMap: - name: mariadb-bin - - name: peerfinder - configMap: - name: mariadb-bin - - name: charsets - configMap: - name: mariadb-etc - - name: engine - configMap: - name: mariadb-etc - - name: log - configMap: - name: mariadb-etc - - name: mycnf - configMap: - name: mariadb-etc - - name: networking - configMap: - name: mariadb-etc - - name: pid - configMap: - name: mariadb-etc - - name: tuning - configMap: - name: mariadb-etc - - name: wsrep + - name: mariadb-etc configMap: name: mariadb-etc diff --git a/mistral/templates/deployment-api.yaml b/mistral/templates/deployment-api.yaml index 5463cd0068..1ee88a5706 100644 --- a/mistral/templates/deployment-api.yaml +++ b/mistral/templates/deployment-api.yaml @@ -71,11 +71,11 @@ spec: volumeMounts: - name: pod-etc-mistral mountPath: /etc/mistral - - name: mistralconf + - name: mistral-etc mountPath: /etc/mistral/mistral.conf subPath: mistral.conf readOnly: true - - name: mistralpolicy + - name: mistral-etc mountPath: /etc/mistral/policy.json subPath: policy.json readOnly: true @@ -83,10 +83,7 @@ spec: volumes: - name: pod-etc-mistral emptyDir: {} - - name: mistralconf - configMap: - name: mistral-etc - - name: mistralpolicy + - name: mistral-etc configMap: name: mistral-etc {{ if $mounts_mistral_api.volumes }}{{ toYaml $mounts_mistral_api.volumes | indent 8 }}{{ end }} diff --git a/mistral/templates/deployment-executor.yaml b/mistral/templates/deployment-executor.yaml index be93575113..c2c51356ad 100644 --- a/mistral/templates/deployment-executor.yaml +++ b/mistral/templates/deployment-executor.yaml @@ -65,7 +65,7 @@ spec: volumeMounts: - name: pod-etc-mistral mountPath: /etc/mistral - - name: mistralconf + - name: mistral-etc mountPath: /etc/mistral/mistral.conf subPath: mistral.conf readOnly: true @@ -73,7 +73,7 @@ spec: volumes: - name: pod-etc-mistral emptyDir: {} - - name: mistralconf + - name: mistral-etc configMap: name: mistral-etc {{ if $mounts_mistral_executor.volumes }}{{ toYaml $mounts_mistral_executor.volumes | indent 8 }}{{ end }} diff --git a/mistral/templates/job-db-init.yaml b/mistral/templates/job-db-init.yaml index 0f985a347a..08431c5a56 100644 --- a/mistral/templates/job-db-init.yaml +++ b/mistral/templates/job-db-init.yaml @@ -64,7 +64,7 @@ spec: readOnly: true - name: pod-etc-mistral mountPath: /etc/mistral - - name: mistralconf + - name: mistral-etc mountPath: /etc/mistral/mistral.conf subPath: mistral.conf readOnly: true @@ -74,6 +74,6 @@ spec: name: mistral-bin - name: pod-etc-mistral emptyDir: {} - - name: mistralconf + - name: mistral-etc configMap: name: mistral-etc diff --git a/mistral/templates/job-db-sync.yaml b/mistral/templates/job-db-sync.yaml index 069563c37f..cd11967547 100644 --- a/mistral/templates/job-db-sync.yaml +++ b/mistral/templates/job-db-sync.yaml @@ -49,19 +49,19 @@ spec: volumeMounts: - name: pod-etc-mistral mountPath: /etc/mistral - - name: mistralconf + - name: mistral-etc mountPath: /etc/mistral/mistral.conf subPath: mistral.conf readOnly: true - - name: db-sync + - name: mistral-bin mountPath: /tmp/db-sync.sh subPath: db-sync.sh volumes: - name: pod-etc-mistral emptyDir: {} - - name: mistralconf + - name: mistral-etc configMap: name: mistral-etc - - name: db-sync + - name: mistral-bin configMap: name: mistral-bin diff --git a/mistral/templates/statefulset-engine.yaml b/mistral/templates/statefulset-engine.yaml index ec08f9998d..d94ab92bfa 100644 --- a/mistral/templates/statefulset-engine.yaml +++ b/mistral/templates/statefulset-engine.yaml @@ -58,7 +58,7 @@ spec: volumeMounts: - name: pod-etc-mistral mountPath: /etc/mistral - - name: mistralconf + - name: mistral-etc mountPath: /etc/mistral/mistral.conf subPath: mistral.conf readOnly: true @@ -66,7 +66,7 @@ spec: volumes: - name: pod-etc-mistral emptyDir: {} - - name: mistralconf + - name: mistral-etc configMap: name: mistral-etc {{ if $mounts_mistral_engine.volumes }}{{ toYaml $mounts_mistral_engine.volumes | indent 8 }}{{ end }} diff --git a/mistral/templates/statefulset-event-engine.yaml b/mistral/templates/statefulset-event-engine.yaml index 517d8ce138..0bfbed8b6c 100644 --- a/mistral/templates/statefulset-event-engine.yaml +++ b/mistral/templates/statefulset-event-engine.yaml @@ -58,7 +58,7 @@ spec: volumeMounts: - name: pod-etc-mistral mountPath: /etc/mistral - - name: mistralconf + - name: mistral-etc mountPath: /etc/mistral/mistral.conf subPath: mistral.conf readOnly: true @@ -66,7 +66,7 @@ spec: volumes: - name: pod-etc-mistral emptyDir: {} - - name: mistralconf + - name: mistral-etc configMap: name: mistral-etc {{ if $mounts_mistral_event_engine.volumes }}{{ toYaml $mounts_mistral_event_engine.volumes | indent 8 }}{{ end }} diff --git a/neutron/templates/daemonset-ovs-db.yaml b/neutron/templates/daemonset-ovs-db.yaml index 4dbb261468..1bf11f27ea 100644 --- a/neutron/templates/daemonset-ovs-db.yaml +++ b/neutron/templates/daemonset-ovs-db.yaml @@ -50,12 +50,12 @@ spec: - bash - /tmp/openvswitch-db-server.sh volumeMounts: - - name: openvswitchdbserversh + - name: neutron-bin mountPath: /tmp/openvswitch-db-server.sh subPath: openvswitch-db-server.sh readOnly: true - - mountPath: /etc/resolv.conf - name: resolvconf + - name: neutron-etc + mountPath: /etc/resolv.conf subPath: resolv.conf readOnly: true - name: varlibopenvswitch @@ -63,12 +63,12 @@ spec: - name: run mountPath: /run volumes: - - name: openvswitchdbserversh + - name: neutron-bin configMap: name: neutron-bin - name: varlibopenvswitch emptyDir: {} - - name: resolvconf + - name: neutron-etc configMap: name: neutron-etc - name: libmodules diff --git a/neutron/templates/job-db-init.yaml b/neutron/templates/job-db-init.yaml index 13456fc465..59256a4d39 100644 --- a/neutron/templates/job-db-init.yaml +++ b/neutron/templates/job-db-init.yaml @@ -55,14 +55,14 @@ spec: readOnly: true - name: etcneutron mountPath: /etc/neutron - - name: neutronconf + - name: neutron-etc mountPath: /etc/neutron/neutron.conf subPath: neutron.conf readOnly: true volumes: - name: etcneutron emptyDir: {} - - name: neutronconf + - name: neutron-etc configMap: name: neutron-etc - name: neutron-bin diff --git a/neutron/templates/job-db-sync.yaml b/neutron/templates/job-db-sync.yaml index 29ef20070c..8ea7ddf4dd 100644 --- a/neutron/templates/job-db-sync.yaml +++ b/neutron/templates/job-db-sync.yaml @@ -60,18 +60,18 @@ spec: readOnly: true - name: etcneutron mountPath: /etc/neutron - - name: neutronconf + - name: neutron-etc mountPath: /etc/neutron/neutron.conf subPath: neutron.conf readOnly: true - - name: neutronconf + - name: neutron-etc mountPath: /etc/neutron/plugins/ml2/ml2_conf.ini subPath: ml2_conf.ini readOnly: true volumes: - name: etcneutron emptyDir: {} - - name: neutronconf + - name: neutron-etc configMap: name: neutron-etc - name: neutron-bin diff --git a/nova/templates/job-bootstrap.yaml b/nova/templates/job-bootstrap.yaml index 59c31836eb..0adff4c26e 100644 --- a/nova/templates/job-bootstrap.yaml +++ b/nova/templates/job-bootstrap.yaml @@ -57,13 +57,13 @@ spec: mountPath: /tmp/bootstrap.sh subPath: bootstrap.sh readOnly: true - - name: novaconf + - name: nova-etc mountPath: /etc/nova/nova.conf subPath: nova.conf readOnly: true {{ if $mounts_nova_bootstrap.volumeMounts }}{{ toYaml $mounts_nova_bootstrap.volumeMounts | indent 12 }}{{ end }} volumes: - - name: novaconf + - name: nova-etc configMap: name: nova-etc - name: nova-bin diff --git a/nova/templates/job-db-init.yaml b/nova/templates/job-db-init.yaml index 309ceb9fa8..c4f21af1f1 100644 --- a/nova/templates/job-db-init.yaml +++ b/nova/templates/job-db-init.yaml @@ -64,7 +64,7 @@ spec: readOnly: true - name: etcnova mountPath: /etc/nova - - name: novaconf + - name: nova-etc mountPath: /etc/nova/nova.conf subPath: nova.conf readOnly: true @@ -102,14 +102,14 @@ spec: readOnly: true - name: etcnova mountPath: /etc/nova - - name: novaconf + - name: nova-etc mountPath: /etc/nova/nova.conf subPath: nova.conf readOnly: true volumes: - name: etcnova emptyDir: {} - - name: novaconf + - name: nova-etc configMap: name: nova-etc - name: nova-bin diff --git a/nova/templates/job-db-sync.yaml b/nova/templates/job-db-sync.yaml index 84876c19a5..2056cf21a5 100644 --- a/nova/templates/job-db-sync.yaml +++ b/nova/templates/job-db-sync.yaml @@ -52,14 +52,14 @@ spec: readOnly: true - name: etcnova mountPath: /etc/nova - - name: novaconf + - name: nova-etc mountPath: /etc/nova/nova.conf subPath: nova.conf readOnly: true volumes: - name: etcnova emptyDir: {} - - name: novaconf + - name: nova-etc configMap: name: nova-etc - name: nova-bin