Rafactoring volume mount variables in db sync job

This patch make the db sync job template follows the same pattern
that other templates utilize the variables to make in a predictable
pattern.

Change-Id: Idbedd046c6b4fd001cf63004ffac792173a5778b
Story: 2005754
Task: 33457

aodh/templates/job-db-sync.yaml

@@ -16,5 +16,6 @@ limitations under the License.
 
 {{- if .Values.manifests.job_db_sync }}
 {{- $dbSyncJob := dict "envAll" . "serviceName" "aodh" -}}
+{{- $dbSyncJob := dict "envAll" . "serviceName" "aodh" "podVolMounts" .Values.pod.mounts.aodh_db_sync.aodh_db_sync.volumeMounts "podVols" .Values.pod.mounts.aodh_db_sync.aodh_db_sync.volumes -}}
 {{ $dbSyncJob | include "helm-toolkit.manifests.job_db_sync" }}
 {{- end }}

aodh/values.yaml

@@ -133,6 +133,10 @@ pod:
       aodh_tests:
         volumeMounts:
         volumes:
+    aodh_db_sync:
+      aodh_db_sync:
+        volumeMounts:
+        volumes:
   replicas:
     api: 1
     evaluator: 1

barbican/templates/job-db-sync.yaml

@@ -15,6 +15,6 @@ limitations under the License.
 */}}
 
 {{- if .Values.manifests.job_db_sync }}
-{{- $dbSyncJob := dict "envAll" . "serviceName" "barbican" -}}
+{{- $dbSyncJob := dict "envAll" . "serviceName" "barbican" "podVolMounts" .Values.pod.mounts.barbican_db_sync.barbican_db_sync.volumeMounts "podVols" .Values.pod.mounts.barbican_db_sync.barbican_db_sync.volumes -}}
 {{ $dbSyncJob | include "helm-toolkit.manifests.job_db_sync" }}
 {{- end }}

barbican/values.yaml

@@ -77,6 +77,10 @@ pod:
       barbican_tests:
         volumeMounts:
         volumes:
+    barbican_db_sync:
+      barbican_db_sync:
+        volumeMounts:
+        volumes:
   replicas:
     api: 1
   lifecycle:

ceilometer/templates/job-db-sync.yaml

@@ -15,6 +15,6 @@ limitations under the License.
 */}}
 
 {{- if .Values.manifests.job_db_sync }}
-{{- $dbSyncJob := dict "envAll" . "serviceName" "ceilometer" -}}
+{{- $dbSyncJob := dict "envAll" . "serviceName" "ceilometer" "podVolMounts" .Values.pod.mounts.ceilometer_db_sync.ceilometer_db_sync.volumeMounts "podVols" .Values.pod.mounts.ceilometer_db_sync.ceilometer_db_sync.volumes -}}
 {{ $dbSyncJob | include "helm-toolkit.manifests.job_db_sync" }}
 {{- end }}

ceilometer/values.yaml

@@ -1956,6 +1956,10 @@ pod:
       ceilometer_notification:
         volumeMounts:
         volumes:
+    ceilometer_db_sync:
+      ceilometer_db_sync:
+        volumeMounts:
+        volumes:
   replicas:
     api: 1
     central: 1

cinder/templates/job-db-sync.yaml

@@ -15,6 +15,6 @@ limitations under the License.
 */}}
 
 {{- if .Values.manifests.job_db_sync }}
-{{- $dbSyncJob := dict "envAll" . "serviceName" "cinder" -}}
+{{- $dbSyncJob := dict "envAll" . "serviceName" "cinder" "podVolMounts" .Values.pod.mounts.cinder_db_sync.cinder_db_sync.volumeMounts "podVols" .Values.pod.mounts.cinder_db_sync.cinder_db_sync.volumes -}}
 {{ $dbSyncJob | include "helm-toolkit.manifests.job_db_sync" }}
 {{- end }}

cinder/values.yaml

@@ -134,6 +134,10 @@ pod:
       cinder_tests:
         volumeMounts:
         volumes:
+    cinder_db_sync:
+      cinder_db_sync:
+        volumeMounts:
+        volumes:
   replicas:
     api: 1
     volume: 1

congress/templates/job-db-sync.yaml

@@ -16,5 +16,6 @@ limitations under the License.
 
 {{- if .Values.manifests.job_db_sync }}
 {{- $dbSyncJob := dict "envAll" . "serviceName" "congress" -}}
+{{- $dbSyncJob := dict "envAll" . "serviceName" "congress" "podVolMounts" .Values.pod.mounts.congress_db_sync.congress_db_sync.volumeMounts "podVols" .Values.pod.mounts.congress_db_sync.congress_db_sync.volumes -}}
 {{ $dbSyncJob | include "helm-toolkit.manifests.job_db_sync" }}
 {{- end }}

congress/values.yaml

@@ -477,6 +477,11 @@ pod:
         default: kubernetes.io/hostname
       weight:
         default: 10
+  mounts:
+    congress_db_sync:
+      congress_db_sync:
+        volumeMounts:
+        volumes:
   replicas:
     api: 1
     policy_engine: 1

glance/templates/job-db-sync.yaml

@@ -15,8 +15,8 @@ limitations under the License.
 */}}
 
 {{- if .Values.manifests.job_db_sync }}
-{{- $serviceName := "glance" -}}
+{{- $dbToSync := index . "dbToSync" | default ( dict "configFile" (printf "/etc/%s/%s.conf" "glance" "glance-api" ) "logConfigFile" (printf "/etc/%s/logging.conf" "glance" ) "image" ( index .Values.images.tags ( printf "%s_db_sync" "glance" )) ) -}}
-{{- $dbToSync := index . "dbToSync" | default ( dict "configFile" (printf "/etc/%s/%s.conf" $serviceName "glance-api" ) "logConfigFile" (printf "/etc/%s/logging.conf" $serviceName ) "image" ( index .Values.images.tags ( printf "%s_db_sync" $serviceName )) ) -}}
+{{- $dbSyncJob := dict "envAll" . "serviceName" "glance" "podVolMounts" .Values.pod.mounts.glance_db_sync.glance_db_sync.volumeMounts "podVols" .Values.pod.mounts.glance_db_sync.glance_db_sync.volumes "dbToSync" $dbToSync -}}
-{{- $dbSyncJob := dict "envAll" . "serviceName" $serviceName "dbToSync" $dbToSync -}}
+
 {{ $dbSyncJob | include "helm-toolkit.manifests.job_db_sync" }}
 {{- end }}

glance/values.yaml

@@ -842,6 +842,10 @@ pod:
       glance_tests:
         volumeMounts:
         volumes:
+    glance_db_sync:
+      glance_db_sync:
+        volumeMounts:
+        volumes:
   replicas:
     api: 1
     registry: 1

heat/templates/job-db-sync.yaml

@@ -15,6 +15,6 @@ limitations under the License.
 */}}
 
 {{- if .Values.manifests.job_db_sync }}
-{{- $dbSyncJob := dict "envAll" . "serviceName" "heat" -}}
+{{- $dbSyncJob := dict "envAll" . "serviceName" "heat" "podVolMounts" .Values.pod.mounts.heat_db_sync.heat_db_sync.volumeMounts "podVols" .Values.pod.mounts.heat_db_sync.heat_db_sync.volumes -}}
 {{ $dbSyncJob | include "helm-toolkit.manifests.job_db_sync" }}
 {{- end }}

heat/values.yaml

@@ -1079,6 +1079,10 @@ pod:
       heat_tests:
         volumeMounts:
         volumes:
+    heat_db_sync:
+      heat_db_sync:
+        volumeMounts:
+        volumes:
   replicas:
     api: 1
     cfn: 1

ironic/templates/job-db-sync.yaml

@@ -15,6 +15,6 @@ limitations under the License.
 */}}
 
 {{- if .Values.manifests.job_db_sync }}
-{{- $dbSyncJob := dict "envAll" . "serviceName" "ironic" -}}
+{{- $dbSyncJob := dict "envAll" . "serviceName" "ironic" "podVolMounts" .Values.pod.mounts.ironic_db_sync.ironic_db_sync.volumeMounts "podVols" .Values.pod.mounts.ironic_db_sync.ironic_db_sync.volumes -}}
 {{ $dbSyncJob | include "helm-toolkit.manifests.job_db_sync" }}
 {{- end }}

ironic/values.yaml

@@ -581,6 +581,10 @@ pod:
       ironic_bootstrap:
         volumeMounts:
         volumes:
+    ironic_db_sync:
+      ironic_db_sync:
+        volumeMounts:
+        volumes:
   replicas:
     api: 1
     conductor: 1

magnum/templates/job-db-sync.yaml

@@ -15,6 +15,6 @@ limitations under the License.
 */}}
 
 {{- if .Values.manifests.job_db_sync }}
-{{- $dbSyncJob := dict "envAll" . "serviceName" "magnum" -}}
+{{- $dbSyncJob := dict "envAll" . "serviceName" "magnum" "podVolMounts" .Values.pod.mounts.magnum_db_sync.magnum_db_sync.volumeMounts "podVols" .Values.pod.mounts.magnum_db_sync.magnum_db_sync.volumes -}}
 {{ $dbSyncJob | include "helm-toolkit.manifests.job_db_sync" }}
 {{- end }}

magnum/values.yaml

@@ -506,6 +506,10 @@ pod:
       magnum_bootstrap:
         volumeMounts:
         volumes:
+    magnum_db_sync:
+      magnum_db_sync:
+        volumeMounts:
+        volumes:
   replicas:
     api: 1
     conductor: 1

mistral/templates/job-db-sync.yaml

@@ -16,6 +16,6 @@ limitations under the License.
 */}}
 
 {{- if .Values.manifests.job_db_sync }}
-{{- $dbSyncJob := dict "envAll" . "serviceName" "mistral" -}}
+{{- $dbSyncJob := dict "envAll" . "serviceName" "mistral" "podVolMounts" .Values.pod.mounts.mistral_db_sync.mistral_db_sync.volumeMounts "podVols" .Values.pod.mounts.mistral_db_sync.mistral_db_sync.volumes -}}
 {{ $dbSyncJob | include "helm-toolkit.manifests.job_db_sync" }}
 {{- end }}

mistral/values.yaml

@@ -570,6 +570,10 @@ pod:
       mistral_tests:
         volumeMounts:
         volumes:
+    mistral_db_sync:
+      mistral_db_sync:
+        volumeMounts:
+        volumes:
   replicas:
     api: 1
     engine: 1

neutron/templates/job-db-sync.yaml

@@ -15,7 +15,6 @@ limitations under the License.
 */}}
 
 {{- if .Values.manifests.job_db_sync }}
-{{- $podVolMounts := list (dict "name" "db-sync-conf" "mountPath" "/etc/neutron/plugins/ml2/ml2_conf.ini" "subPath" "ml2_conf.ini" "readOnly" true )}}
+{{- $dbSyncJob := dict "envAll" . "serviceName" "neutron" "podVolMounts" .Values.pod.mounts.neutron_db_sync.neutron_db_sync.volumeMounts "podVols" .Values.pod.mounts.neutron_db_sync.neutron_db_sync.volumes -}}
-{{- $dbSyncJob := dict "envAll" . "serviceName" "neutron" "podVolMounts" $podVolMounts -}}
 {{ $dbSyncJob | include "helm-toolkit.manifests.job_db_sync" }}
 {{- end }}

neutron/values.yaml

@@ -358,6 +358,14 @@ pod:
       neutron_bootstrap:
         volumeMounts:
         volumes:
+    neutron_db_sync:
+      neutron_db_sync:
+        volumeMounts:
+          - name: db-sync-conf
+            mountPath: /etc/neutron/plugins/ml2/ml2_conf.ini
+            subPath: ml2_conf.ini
+            readOnly: true
+        volumes:
   replicas:
     server: 1
   lifecycle:

nova/templates/job-db-sync.yaml

@@ -15,6 +15,6 @@ limitations under the License.
 */}}
 
 {{- if .Values.manifests.job_db_sync }}
-{{- $dbSyncJob := dict "envAll" . "serviceName" "nova" -}}
+{{- $dbSyncJob := dict "envAll" . "serviceName" "nova" "podVolMounts" .Values.pod.mounts.nova_db_sync.nova_db_sync.volumeMounts "podVols" .Values.pod.mounts.nova_db_sync.nova_db_sync.volumes -}}
 {{ $dbSyncJob | include "helm-toolkit.manifests.job_db_sync" }}
 {{- end }}

nova/values.yaml

@@ -2183,6 +2183,10 @@ pod:
       nova_spiceproxy:
         volumeMounts:
         volumes:
+    nova_db_sync:
+      nova_db_sync:
+        volumeMounts:
+        volumes:
   replicas:
     api_metadata: 1
     compute_ironic: 1

panko/templates/job-db-sync.yaml

@@ -15,6 +15,6 @@ limitations under the License.
 */}}
 
 {{- if .Values.manifests.job_db_sync }}
-{{- $dbSyncJob := dict "envAll" . "serviceName" "panko" -}}
+{{- $dbSyncJob := dict "envAll" . "serviceName" "panko" "podVolMounts" .Values.pod.mounts.panko_db_sync.panko_db_sync.volumeMounts "podVols" .Values.pod.mounts.panko_db_sync.panko_db_sync.volumes -}}
 {{ $dbSyncJob | include "helm-toolkit.manifests.job_db_sync" }}
 {{- end }}

panko/values.yaml

@@ -480,6 +480,10 @@ pod:
       panko_tests:
         volumeMounts:
         volumes:
+    panko_db_sync:
+      panko_db_sync:
+        volumeMounts:
+        volumes:
   replicas:
     api: 1
   lifecycle:

senlin/templates/job-db-sync.yaml

@@ -15,6 +15,6 @@ limitations under the License.
 */}}
 
 {{- if .Values.manifests.job_db_sync }}
-{{- $dbSyncJob := dict "envAll" . "serviceName" "senlin" -}}
+{{- $dbSyncJob := dict "envAll" . "serviceName" "senlin" "podVolMounts" .Values.pod.mounts.senlin_db_sync.senlin_db_sync.volumeMounts "podVols" .Values.pod.mounts.senlin_db_sync.senlin_db_sync.volumes -}}
 {{ $dbSyncJob | include "helm-toolkit.manifests.job_db_sync" }}
 {{- end }}

senlin/values.yaml

@@ -535,6 +535,10 @@ pod:
       senlin_tests:
         volumeMounts:
         volumes:
+    senlin_db_sync:
+      senlin_db_sync:
+        volumeMounts:
+        volumes:
   replicas:
     api: 1
     engine: 1