Values: Move mounts to pod key

This PS moves the mounts key to be under the pod key in the values.
It brings further consolation of related configuration params to be
nested under common keys across all charts.

Change-Id: If9963e4f8b438847e2fcad3bdd8c0d71ca9ecdd8

barbican/templates/deployment-api.yaml

@@ -14,8 +14,8 @@
 
 {{- $envAll := . }}
 {{- $dependencies := .Values.dependencies.api }}
-{{- $mounts_barbican_api := .Values.mounts.barbican_api.barbican_api }}
+{{- $mounts_barbican_api := .Values.pod.mounts.barbican_api.barbican_api }}
-{{- $mounts_barbican_api_init := .Values.mounts.barbican_api.init_container }}
+{{- $mounts_barbican_api_init := .Values.pod.mounts.barbican_api.init_container }}
 ---
 apiVersion: apps/v1beta1
 kind: Deployment

barbican/templates/job-bootstrap.yaml

@@ -15,8 +15,8 @@
 {{- $envAll := . }}
 {{- if .Values.bootstrap.enabled }}
 {{- $dependencies := .Values.dependencies.bootstrap }}
-{{- $mounts_barbican_bootstrap := .Values.mounts.barbican_bootstrap.barbican_bootstrap }}
+{{- $mounts_barbican_bootstrap := .Values.pod.mounts.barbican_bootstrap.barbican_bootstrap }}
-{{- $mounts_barbican_bootstrap_init := .Values.mounts.barbican_bootstrap.init_container }}
+{{- $mounts_barbican_bootstrap_init := .Values.pod.mounts.barbican_bootstrap.init_container }}
 ---
 apiVersion: batch/v1
 kind: Job

barbican/values.yaml

@@ -26,6 +26,13 @@ images:
   pull_policy: "IfNotPresent"
 
 pod:
+  mounts:
+    barbican_api:
+      init_container: null
+      barbican_api:
+    barbican_bootstrap:
+      init_container: null
+      barbican_bootstrap:
   replicas:
     api: 1
   lifecycle:
@@ -264,11 +271,3 @@ endpoints:
     port:
       memcache:
         default: 11211
-
-mounts:
-  barbican_api:
-    init_container: null
-    barbican_api:
-  barbican_bootstrap:
-    init_container: null
-    barbican_bootstrap:

cinder/templates/deployment-api.yaml

@@ -14,8 +14,8 @@
 
 {{- $envAll := . }}
 {{- $dependencies := .Values.dependencies.api }}
-{{- $mounts_cinder_api := .Values.mounts.cinder_api.cinder_api }}
+{{- $mounts_cinder_api := .Values.pod.mounts.cinder_api.cinder_api }}
-{{- $mounts_cinder_api_init := .Values.mounts.cinder_api.init_container }}
+{{- $mounts_cinder_api_init := .Values.pod.mounts.cinder_api.init_container }}
 ---
 apiVersion: apps/v1beta1
 kind: Deployment

cinder/templates/deployment-backup.yaml

@@ -14,8 +14,8 @@
 
 {{- $envAll := . }}
 {{- $dependencies := .Values.dependencies.backup }}
-{{- $mounts_cinder_backup := .Values.mounts.cinder_backup.cinder_backup }}
+{{- $mounts_cinder_backup := .Values.pod.mounts.cinder_backup.cinder_backup }}
-{{- $mounts_cinder_backup_init := .Values.mounts.cinder_backup.init_container }}
+{{- $mounts_cinder_backup_init := .Values.pod.mounts.cinder_backup.init_container }}
 ---
 apiVersion: apps/v1beta1
 kind: Deployment

cinder/templates/deployment-scheduler.yaml

@@ -14,8 +14,8 @@
 
 {{- $envAll := . }}
 {{- $dependencies := .Values.dependencies.scheduler }}
-{{- $mounts_cinder_scheduler := .Values.mounts.cinder_scheduler.cinder_scheduler }}
+{{- $mounts_cinder_scheduler := .Values.pod.mounts.cinder_scheduler.cinder_scheduler }}
-{{- $mounts_cinder_scheduler_init := .Values.mounts.cinder_scheduler.init_container }}
+{{- $mounts_cinder_scheduler_init := .Values.pod.mounts.cinder_scheduler.init_container }}
 ---
 apiVersion: apps/v1beta1
 kind: Deployment

cinder/templates/deployment-volume.yaml

@@ -14,8 +14,8 @@
 
 {{- $envAll := . }}
 {{- $dependencies := .Values.dependencies.volume }}
-{{- $mounts_cinder_volume := .Values.mounts.cinder_volume.cinder_volume }}
+{{- $mounts_cinder_volume := .Values.pod.mounts.cinder_volume.cinder_volume }}
-{{- $mounts_cinder_volume_init := .Values.mounts.cinder_volume.init_container }}
+{{- $mounts_cinder_volume_init := .Values.pod.mounts.cinder_volume.init_container }}
 ---
 apiVersion: apps/v1beta1
 kind: Deployment

cinder/templates/pod-rally-test.yaml

@@ -14,8 +14,8 @@
 
 {{- $envAll := . }}
 {{- $dependencies := .Values.dependencies.tests }}
-{{- $mounts_cinder_tests := .Values.mounts.cinder_tests.cinder_tests }}
+{{- $mounts_cinder_tests := .Values.pod.mounts.cinder_tests.cinder_tests }}
-{{- $mounts_cinder_tests_init := .Values.mounts.cinder_tests.init_container }}
+{{- $mounts_cinder_tests_init := .Values.pod.mounts.cinder_tests.init_container }}
 ---
 apiVersion: v1
 kind: Pod

cinder/values.yaml

@@ -39,6 +39,22 @@ images:
   pull_policy: "IfNotPresent"
 
 pod:
+  mounts:
+    cinder_api:
+      init_container: null
+      cinder_api:
+    cinder_scheduler:
+      init_container: null
+      cinder_scheduler:
+    cinder_volume:
+      init_container: null
+      cinder_volume:
+    cinder_backup:
+      init_container: null
+      cinder_backup:
+    cinder_tests:
+      init_container: null
+      cinder_tests:
   replicas:
     api: 1
     volume: 1
@@ -437,20 +453,3 @@ endpoints:
     port:
       memcache:
         default: 11211
-
-mounts:
-  cinder_api:
-    init_container: null
-    cinder_api:
-  cinder_scheduler:
-    init_container: null
-    cinder_scheduler:
-  cinder_volume:
-    init_container: null
-    cinder_volume:
-  cinder_backup:
-    init_container: null
-    cinder_backup:
-  cinder_tests:
-    init_container: null
-    cinder_tests:

glance/templates/deployment-api.yaml

@@ -14,8 +14,8 @@
 
 {{- $envAll := . }}
 {{- $dependencies := .Values.dependencies.api }}
-{{- $mounts_glance_api := .Values.mounts.glance_api.glance_api }}
+{{- $mounts_glance_api := .Values.pod.mounts.glance_api.glance_api }}
-{{- $mounts_glance_api_init := .Values.mounts.glance_api.init_container }}
+{{- $mounts_glance_api_init := .Values.pod.mounts.glance_api.init_container }}
 ---
 apiVersion: apps/v1beta1
 kind: Deployment

glance/templates/deployment-registry.yaml

@@ -14,8 +14,8 @@
 
 {{- $envAll := . }}
 {{- $dependencies := .Values.dependencies.registry }}
-{{- $mounts_glance_registry := .Values.mounts.glance_registry.glance_registry }}
+{{- $mounts_glance_registry := .Values.pod.mounts.glance_registry.glance_registry }}
-{{- $mounts_glance_registry_init := .Values.mounts.glance_registry.init_container }}
+{{- $mounts_glance_registry_init := .Values.pod.mounts.glance_registry.init_container }}
 ---
 apiVersion: apps/v1beta1
 kind: Deployment

glance/templates/pod-rally-test.yaml

@@ -14,8 +14,8 @@
 
 {{- $envAll := . }}
 {{- $dependencies := .Values.dependencies.tests }}
-{{- $mounts_glance_tests := .Values.mounts.glance_tests.glance_tests }}
+{{- $mounts_glance_tests := .Values.pod.mounts.glance_tests.glance_tests }}
-{{- $mounts_glance_tests_init := .Values.mounts.glance_tests.init_container }}
+{{- $mounts_glance_tests_init := .Values.pod.mounts.glance_tests.init_container }}
 ---
 apiVersion: v1
 kind: Pod

glance/values.yaml

@@ -304,18 +304,17 @@ endpoints:
       amqp:
         default: 5672
 
-mounts:
-  glance_api:
-    init_container: null
-    glance_api:
-  glance_registry:
-    init_container: null
-    glance_registry:
-  glance_tests:
-    init_container: null
-    glance_tests:
-
 pod:
+  mounts:
+    glance_api:
+      init_container: null
+      glance_api:
+    glance_registry:
+      init_container: null
+      glance_registry:
+    glance_tests:
+      init_container: null
+      glance_tests:
   replicas:
     api: 1
     registry: 1

heat/templates/deployment-api.yaml

@@ -14,8 +14,8 @@
 
 {{- $envAll := . }}
 {{- $dependencies := .Values.dependencies.api }}
-{{- $mounts_heat_api := .Values.mounts.heat_api.heat_api }}
+{{- $mounts_heat_api := .Values.pod.mounts.heat_api.heat_api }}
-{{- $mounts_heat_api_init := .Values.mounts.heat_api.init_container }}
+{{- $mounts_heat_api_init := .Values.pod.mounts.heat_api.init_container }}
 ---
 apiVersion: apps/v1beta1
 kind: Deployment

heat/templates/deployment-cfn.yaml

@@ -14,8 +14,8 @@
 
 {{- $envAll := . }}
 {{- $dependencies := .Values.dependencies.cfn }}
-{{- $mounts_heat_cfn := .Values.mounts.heat_cfn.heat_cfn }}
+{{- $mounts_heat_cfn := .Values.pod.mounts.heat_cfn.heat_cfn }}
-{{- $mounts_heat_cfn_init := .Values.mounts.heat_cfn.init_container }}
+{{- $mounts_heat_cfn_init := .Values.pod.mounts.heat_cfn.init_container }}
 ---
 apiVersion: apps/v1beta1
 kind: Deployment

heat/templates/deployment-cloudwatch.yaml

@@ -14,8 +14,8 @@
 
 {{- $envAll := . }}
 {{- $dependencies := .Values.dependencies.cloudwatch }}
-{{- $mounts_heat_cloudwatch := .Values.mounts.heat_cloudwatch.heat_cloudwatch }}
+{{- $mounts_heat_cloudwatch := .Values.pod.mounts.heat_cloudwatch.heat_cloudwatch }}
-{{- $mounts_heat_cloudwatch_init := .Values.mounts.heat_cloudwatch.init_container }}
+{{- $mounts_heat_cloudwatch_init := .Values.pod.mounts.heat_cloudwatch.init_container }}
 ---
 apiVersion: apps/v1beta1
 kind: Deployment

heat/templates/job-bootstrap.yaml

@@ -15,8 +15,8 @@
 {{- $envAll := . }}
 {{- if .Values.bootstrap.enabled }}
 {{- $dependencies := .Values.dependencies.bootstrap }}
-{{- $mounts_heat_bootstrap := .Values.mounts.heat_bootstrap.heat_bootstrap }}
+{{- $mounts_heat_bootstrap := .Values.pod.mounts.heat_bootstrap.heat_bootstrap }}
-{{- $mounts_heat_bootstrap_init := .Values.mounts.heat_bootstrap.init_container }}
+{{- $mounts_heat_bootstrap_init := .Values.pod.mounts.heat_bootstrap.init_container }}
 ---
 apiVersion: batch/v1
 kind: Job

heat/templates/statefulset-engine.yaml

@@ -14,8 +14,8 @@
 
 {{- $envAll := . }}
 {{- $dependencies := .Values.dependencies.engine }}
-{{- $mounts_heat_engine := .Values.mounts.heat_engine.heat_engine }}
+{{- $mounts_heat_engine := .Values.pod.mounts.heat_engine.heat_engine }}
-{{- $mounts_heat_engine_init := .Values.mounts.heat_engine.init_container }}
+{{- $mounts_heat_engine_init := .Values.pod.mounts.heat_engine.init_container }}
 ---
 apiVersion: apps/v1beta1
 kind: StatefulSet

heat/values.yaml

@@ -325,6 +325,22 @@ endpoints:
         default: 5672
 
 pod:
+  mounts:
+    heat_api:
+      init_container: null
+      heat_api:
+    heat_cfn:
+      init_container: null
+      heat_cfn:
+    heat_cloudwatch:
+      init_container: null
+      heat_cloudwatch:
+    heat_engine:
+      init_container: null
+      heat_engine:
+    heat_bootstrap:
+      init_container: null
+      heat_bootstrap:
   replicas:
     api: 1
     cfn: 1
@@ -432,20 +448,3 @@ pod:
         limits:
           memory: "1024Mi"
           cpu: "2000m"
-
-mounts:
-  heat_api:
-    init_container: null
-    heat_api:
-  heat_cfn:
-    init_container: null
-    heat_cfn:
-  heat_cloudwatch:
-    init_container: null
-    heat_cloudwatch:
-  heat_engine:
-    init_container: null
-    heat_engine:
-  heat_bootstrap:
-    init_container: null
-    heat_bootstrap:

horizon/templates/deployment.yaml

@@ -14,8 +14,8 @@
 
 {{- $envAll := . }}
 {{- $dependencies := .Values.dependencies.dashboard }}
-{{- $mounts_horizon := .Values.mounts.horizon.horizon }}
+{{- $mounts_horizon := .Values.pod.mounts.horizon.horizon }}
-{{- $mounts_horizon_init := .Values.mounts.horizon.init_container }}
+{{- $mounts_horizon_init := .Values.pod.mounts.horizon.init_container }}
 ---
 apiVersion: apps/v1beta1
 kind: Deployment

horizon/templates/job-db-init.yaml

@@ -14,8 +14,8 @@
 
 {{- $envAll := . }}
 {{- $dependencies := .Values.dependencies.db_init }}
-{{- $mounts_horizon_db_init := .Values.mounts.horizon_db_init.horizon_db_init }}
+{{- $mounts_horizon_db_init := .Values.pod.mounts.horizon_db_init.horizon_db_init }}
-{{- $mounts_horizon_db_init_init := .Values.mounts.horizon_db_init.init_container }}
+{{- $mounts_horizon_db_init_init := .Values.pod.mounts.horizon_db_init.init_container }}
 ---
 apiVersion: batch/v1
 kind: Job

horizon/templates/job-db-sync.yaml

@@ -14,8 +14,8 @@
 
 {{- $envAll := . }}
 {{- $dependencies := .Values.dependencies.db_sync }}
-{{- $mounts_horizon_db_sync := .Values.mounts.horizon_db_sync.horizon_db_sync }}
+{{- $mounts_horizon_db_sync := .Values.pod.mounts.horizon_db_sync.horizon_db_sync }}
-{{- $mounts_horizon_db_sync_init := .Values.mounts.horizon_db_sync.init_container }}
+{{- $mounts_horizon_db_sync_init := .Values.pod.mounts.horizon_db_sync.init_container }}
 ---
 apiVersion: batch/v1
 kind: Job

horizon/values.yaml

@@ -62,6 +62,16 @@ dependencies:
       endpoint: internal
 
 pod:
+  mounts:
+    horizon_db_init:
+      init_container: null
+      horizon_db_init:
+    horizon_db_sync:
+      init_container: null
+      horizon_db_sync:
+    horizon:
+      init_container: null
+      horizon:
   replicas:
     server: 1
   lifecycle:
@@ -160,14 +170,3 @@ endpoints:
     port:
       mysql:
         default: 3306
-
-mounts:
-  horizon_db_init:
-    init_container: null
-    horizon_db_init:
-  horizon_db_sync:
-    init_container: null
-    horizon_db_sync:
-  horizon:
-    init_container: null
-    horizon:

keystone/templates/deployment-api.yaml

@@ -14,8 +14,8 @@
 
 {{- $envAll := . }}
 {{- $dependencies := .Values.dependencies.api }}
-{{- $mounts_keystone_api := .Values.mounts.keystone_api.keystone_api }}
+{{- $mounts_keystone_api := .Values.pod.mounts.keystone_api.keystone_api }}
-{{- $mounts_keystone_api_init := .Values.mounts.keystone_api.init_container }}
+{{- $mounts_keystone_api_init := .Values.pod.mounts.keystone_api.init_container }}
 ---
 apiVersion: apps/v1beta1
 kind: Deployment

keystone/templates/job-bootstrap.yaml

@@ -15,8 +15,8 @@
 {{- $envAll := . }}
 {{- if .Values.bootstrap.enabled }}
 {{- $dependencies := .Values.dependencies.bootstrap }}
-{{- $mounts_keystone_bootstrap := .Values.mounts.keystone_bootstrap.keystone_bootstrap }}
+{{- $mounts_keystone_bootstrap := .Values.pod.mounts.keystone_bootstrap.keystone_bootstrap }}
-{{- $mounts_keystone_bootstrap_init := .Values.mounts.keystone_bootstrap.init_container }}
+{{- $mounts_keystone_bootstrap_init := .Values.pod.mounts.keystone_bootstrap.init_container }}
 ---
 apiVersion: batch/v1
 kind: Job

keystone/templates/job-db-init.yaml

@@ -14,8 +14,8 @@
 
 {{- $envAll := . }}
 {{- $dependencies := .Values.dependencies.db_init }}
-{{- $mounts_keystone_db_init := .Values.mounts.keystone_db_init.keystone_db_init }}
+{{- $mounts_keystone_db_init := .Values.pod.mounts.keystone_db_init.keystone_db_init }}
-{{- $mounts_keystone_db_init_init := .Values.mounts.keystone_db_init.init_container }}
+{{- $mounts_keystone_db_init_init := .Values.pod.mounts.keystone_db_init.init_container }}
 ---
 apiVersion: batch/v1
 kind: Job

keystone/templates/job-db-sync.yaml

@@ -14,8 +14,8 @@
 
 {{- $envAll := . }}
 {{- $dependencies := .Values.dependencies.db_sync }}
-{{- $mounts_keystone_db_sync := .Values.mounts.keystone_db_sync.keystone_db_sync }}
+{{- $mounts_keystone_db_sync := .Values.pod.mounts.keystone_db_sync.keystone_db_sync }}
-{{- $mounts_keystone_db_sync_init := .Values.mounts.keystone_db_sync.init_container }}
+{{- $mounts_keystone_db_sync_init := .Values.pod.mounts.keystone_db_sync.init_container }}
 ---
 apiVersion: batch/v1
 kind: Job

keystone/templates/pod-rally-test.yaml

@@ -14,8 +14,8 @@
 
 {{- $envAll := . }}
 {{- $dependencies := .Values.dependencies.tests }}
-{{- $mounts_keystone_tests := .Values.mounts.keystone_tests.keystone_tests }}
+{{- $mounts_keystone_tests := .Values.pod.mounts.keystone_tests.keystone_tests }}
-{{- $mounts_keystone_tests_init := .Values.mounts.keystone_tests.init_container }}
+{{- $mounts_keystone_tests_init := .Values.pod.mounts.keystone_tests.init_container }}
 ---
 apiVersion: v1
 kind: Pod

keystone/values.yaml

@@ -83,6 +83,22 @@ dependencies:
       endpoint: internal
 
 pod:
+  mounts:
+    keystone_db_init:
+      init_container: null
+      keystone_db_init:
+    keystone_db_sync:
+      init_container: null
+      keystone_db_sync:
+    keystone_api:
+      init_container: null
+      keystone_api:
+    keystone_tests:
+      init_container: null
+      keystone_tests:
+    keystone_bootstrap:
+      init_container: null
+      keystone_bootstrap:
   replicas:
     api: 1
   lifecycle:
@@ -138,23 +154,6 @@ pod:
           memory: "1024Mi"
           cpu: "2000m"
 
-mounts:
-  keystone_db_init:
-    init_container: null
-    keystone_db_init:
-  keystone_db_sync:
-    init_container: null
-    keystone_db_sync:
-  keystone_api:
-    init_container: null
-    keystone_api:
-  keystone_tests:
-    init_container: null
-    keystone_tests:
-  keystone_bootstrap:
-    init_container: null
-    keystone_bootstrap:
-
 conf:
   rally_tests:
     override:

magnum/templates/deployment-api.yaml

@@ -14,8 +14,8 @@
 
 {{- $envAll := . }}
 {{- $dependencies := .Values.dependencies.api }}
-{{- $mounts_magnum_api := .Values.mounts.magnum_api.magnum_api }}
+{{- $mounts_magnum_api := .Values.pod.mounts.magnum_api.magnum_api }}
-{{- $mounts_magnum_api_init := .Values.mounts.magnum_api.init_container }}
+{{- $mounts_magnum_api_init := .Values.pod.mounts.magnum_api.init_container }}
 ---
 apiVersion: apps/v1beta1
 kind: Deployment

magnum/templates/job-bootstrap.yaml

@@ -15,8 +15,8 @@
 {{- $envAll := . }}
 {{- if .Values.bootstrap.enabled }}
 {{- $dependencies := .Values.dependencies.bootstrap }}
-{{- $mounts_magnum_bootstrap := .Values.mounts.magnum_bootstrap.magnum_bootstrap }}
+{{- $mounts_magnum_bootstrap := .Values.pod.mounts.magnum_bootstrap.magnum_bootstrap }}
-{{- $mounts_magnum_bootstrap_init := .Values.mounts.magnum_bootstrap.init_container }}
+{{- $mounts_magnum_bootstrap_init := .Values.pod.mounts.magnum_bootstrap.init_container }}
 ---
 apiVersion: batch/v1
 kind: Job

magnum/templates/statefulset-conductor.yaml

@@ -14,8 +14,8 @@
 
 {{- $envAll := . }}
 {{- $dependencies := .Values.dependencies.conductor }}
-{{- $mounts_magnum_conductor := .Values.mounts.magnum_conductor.magnum_conductor }}
+{{- $mounts_magnum_conductor := .Values.pod.mounts.magnum_conductor.magnum_conductor }}
-{{- $mounts_magnum_conductor_init := .Values.mounts.magnum_conductor.init_container }}
+{{- $mounts_magnum_conductor_init := .Values.pod.mounts.magnum_conductor.init_container }}
 ---
 apiVersion: apps/v1beta1
 kind: StatefulSet

magnum/values.yaml

@@ -206,6 +206,16 @@ endpoints:
         default: 5672
 
 pod:
+  mounts:
+    magnum_api:
+      init_container: null
+      magnum_api:
+    magnum_conductor:
+      init_container: null
+      magnum_conductor:
+    magnum_bootstrap:
+      init_container: null
+      magnum_bootstrap:
   replicas:
     api: 1
     conductor: 1
@@ -289,14 +299,3 @@ pod:
         limits:
           memory: "1024Mi"
           cpu: "2000m"
-
-mounts:
-  magnum_api:
-    init_container: null
-    magnum_api:
-  magnum_conductor:
-    init_container: null
-    magnum_conductor:
-  magnum_bootstrap:
-    init_container: null
-    magnum_bootstrap:

mistral/templates/deployment-api.yaml

@@ -14,8 +14,8 @@
 
 {{- $envAll := . }}
 {{- $dependencies := .Values.dependencies.api }}
-{{- $mounts_mistral_api := .Values.mounts.mistral_api.mistral_api }}
+{{- $mounts_mistral_api := .Values.pod.mounts.mistral_api.mistral_api }}
-{{- $mounts_mistral_api_init := .Values.mounts.mistral_api.init_container }}
+{{- $mounts_mistral_api_init := .Values.pod.mounts.mistral_api.init_container }}
 ---
 apiVersion: apps/v1beta1
 kind: Deployment

mistral/templates/deployment-executor.yaml

@@ -14,8 +14,8 @@
 
 {{- $envAll := . }}
 {{- $dependencies := .Values.dependencies.executor }}
-{{- $mounts_mistral_executor := .Values.mounts.mistral_executor.mistral_executor }}
+{{- $mounts_mistral_executor := .Values.pod.mounts.mistral_executor.mistral_executor }}
-{{- $mounts_mistral_executor_init := .Values.mounts.mistral_executor.init_container }}
+{{- $mounts_mistral_executor_init := .Values.pod.mounts.mistral_executor.init_container }}
 ---
 apiVersion: apps/v1beta1
 kind: Deployment

mistral/templates/job-bootstrap.yaml

@@ -15,8 +15,8 @@
 {{- $envAll := . }}
 {{- if .Values.bootstrap.enabled }}
 {{- $dependencies := .Values.dependencies.bootstrap }}
-{{- $mounts_mistral_bootstrap := .Values.mounts.mistral_bootstrap.mistral_bootstrap }}
+{{- $mounts_mistral_bootstrap := .Values.pod.mounts.mistral_bootstrap.mistral_bootstrap }}
-{{- $mounts_mistral_bootstrap_init := .Values.mounts.mistral_bootstrap.init_container }}
+{{- $mounts_mistral_bootstrap_init := .Values.pod.mounts.mistral_bootstrap.init_container }}
 ---
 apiVersion: batch/v1
 kind: Job

mistral/templates/statefulset-engine.yaml

@@ -14,8 +14,8 @@
 
 {{- $envAll := . }}
 {{- $dependencies := .Values.dependencies.engine }}
-{{- $mounts_mistral_engine := .Values.mounts.mistral_engine.mistral_engine }}
+{{- $mounts_mistral_engine := .Values.pod.mounts.mistral_engine.mistral_engine }}
-{{- $mounts_mistral_engine_init := .Values.mounts.mistral_engine.init_container }}
+{{- $mounts_mistral_engine_init := .Values.pod.mounts.mistral_engine.init_container }}
 ---
 apiVersion: apps/v1beta1
 kind: StatefulSet

mistral/templates/statefulset-event-engine.yaml

@@ -14,8 +14,8 @@
 
 {{- $envAll := . }}
 {{- $dependencies := .Values.dependencies.event_engine }}
-{{- $mounts_mistral_event_engine := .Values.mounts.mistral_event_engine.mistral_event_engine }}
+{{- $mounts_mistral_event_engine := .Values.pod.mounts.mistral_event_engine.mistral_event_engine }}
-{{- $mounts_mistral_event_engine_init := .Values.mounts.mistral_event_engine.init_container }}
+{{- $mounts_mistral_event_engine_init := .Values.pod.mounts.mistral_event_engine.init_container }}
 ---
 apiVersion: apps/v1beta1
 kind: StatefulSet

mistral/values.yaml

@@ -207,23 +207,6 @@ endpoints:
       memcache:
         default: 11211
 
-mounts:
-  mistral_api:
-    init_container: null
-    mistral_api:
-  mistral_executor:
-    init_container: null
-    mistral_executor:
-  mistral_engine:
-    init_container: null
-    mistral_engine:
-  mistral_event_engine:
-    init_container: null
-    mistral_event_engine:
-  mistral_bootstrap:
-    init_container: null
-    mistral_bootstrap:
-
 conf:
   policy:
     override:
@@ -254,6 +237,22 @@ conf:
           auth_version: v3
 
 pod:
+  mounts:
+    mistral_api:
+      init_container: null
+      mistral_api:
+    mistral_executor:
+      init_container: null
+      mistral_executor:
+    mistral_engine:
+      init_container: null
+      mistral_engine:
+    mistral_event_engine:
+      init_container: null
+      mistral_event_engine:
+    mistral_bootstrap:
+      init_container: null
+      mistral_bootstrap:
   replicas:
     api: 1
     engine: 1

neutron/templates/daemonset-dhcp-agent.yaml

@@ -14,8 +14,8 @@
 
 {{- $envAll := . }}
 {{- $dependencies := .Values.dependencies.dhcp }}
-{{- $mounts_neutron_dhcp_agent := .Values.mounts.neutron_dhcp_agent.neutron_dhcp_agent }}
+{{- $mounts_neutron_dhcp_agent := .Values.pod.mounts.neutron_dhcp_agent.neutron_dhcp_agent }}
-{{- $mounts_neutron_dhcp_agent_init := .Values.mounts.neutron_dhcp_agent.init_container }}
+{{- $mounts_neutron_dhcp_agent_init := .Values.pod.mounts.neutron_dhcp_agent.init_container }}
 ---
 apiVersion: extensions/v1beta1
 kind: DaemonSet

neutron/templates/daemonset-l3-agent.yaml

@@ -14,8 +14,8 @@
 
 {{- $envAll := . }}
 {{- $dependencies := .Values.dependencies.l3 }}
-{{- $mounts_neutron_l3_agent := .Values.mounts.neutron_l3_agent.neutron_l3_agent }}
+{{- $mounts_neutron_l3_agent := .Values.pod.mounts.neutron_l3_agent.neutron_l3_agent }}
-{{- $mounts_neutron_l3_agent_init := .Values.mounts.neutron_l3_agent.init_container }}
+{{- $mounts_neutron_l3_agent_init := .Values.pod.mounts.neutron_l3_agent.init_container }}
 ---
 apiVersion: extensions/v1beta1
 kind: DaemonSet

neutron/templates/daemonset-metadata-agent.yaml

@@ -14,8 +14,8 @@
 
 {{- $envAll := . }}
 {{- $dependencies := .Values.dependencies.metadata }}
-{{- $mounts_neutron_metadata_agent := .Values.mounts.neutron_metadata_agent.neutron_metadata_agent }}
+{{- $mounts_neutron_metadata_agent := .Values.pod.mounts.neutron_metadata_agent.neutron_metadata_agent }}
-{{- $mounts_neutron_metadata_agent_init := .Values.mounts.neutron_metadata_agent.init_container }}
+{{- $mounts_neutron_metadata_agent_init := .Values.pod.mounts.neutron_metadata_agent.init_container }}
 ---
 apiVersion: extensions/v1beta1
 kind: DaemonSet

neutron/templates/daemonset-ovs-agent.yaml

@@ -14,8 +14,8 @@
 
 {{- $envAll := . }}
 {{- $dependencies := .Values.dependencies.ovs_agent }}
-{{- $mounts_neutron_ovs_agent := .Values.mounts.neutron_ovs_agent.neutron_ovs_agent }}
+{{- $mounts_neutron_ovs_agent := .Values.pod.mounts.neutron_ovs_agent.neutron_ovs_agent }}
-{{- $mounts_neutron_ovs_agent_init := .Values.mounts.neutron_ovs_agent.init_container }}
+{{- $mounts_neutron_ovs_agent_init := .Values.pod.mounts.neutron_ovs_agent.init_container }}
 ---
 apiVersion: extensions/v1beta1
 kind: DaemonSet

neutron/templates/deployment-server.yaml

@@ -14,8 +14,8 @@
 
 {{- $envAll := . }}
 {{- $dependencies := .Values.dependencies.server }}
-{{- $mounts_neutron_server := .Values.mounts.neutron_server.neutron_server }}
+{{- $mounts_neutron_server := .Values.pod.mounts.neutron_server.neutron_server }}
-{{- $mounts_neutron_server_init := .Values.mounts.neutron_server.init_container }}
+{{- $mounts_neutron_server_init := .Values.pod.mounts.neutron_server.init_container }}
 ---
 apiVersion: apps/v1beta1
 kind: Deployment

neutron/templates/job-bootstrap.yaml

@@ -15,8 +15,8 @@
 {{- $envAll := . }}
 {{- if .Values.bootstrap.enabled }}
 {{- $dependencies := .Values.dependencies.bootstrap }}
-{{- $mounts_neutron_bootstrap := .Values.mounts.neutron_bootstrap.neutron_bootstrap }}
+{{- $mounts_neutron_bootstrap := .Values.pod.mounts.neutron_bootstrap.neutron_bootstrap }}
-{{- $mounts_neutron_bootstrap_init := .Values.mounts.neutron_bootstrap.init_container }}
+{{- $mounts_neutron_bootstrap_init := .Values.pod.mounts.neutron_bootstrap.init_container }}
 ---
 apiVersion: batch/v1
 kind: Job

neutron/templates/pod-rally-test.yaml

@@ -14,8 +14,8 @@
 
 {{- $envAll := . }}
 {{- $dependencies := .Values.dependencies.tests }}
-{{- $mounts_neutron_tests := .Values.mounts.neutron_tests.neutron_tests }}
+{{- $mounts_neutron_tests := .Values.pod.mounts.neutron_tests.neutron_tests }}
-{{- $mounts_neutron_tests_init := .Values.mounts.neutron_tests.init_container }}
+{{- $mounts_neutron_tests_init := .Values.pod.mounts.neutron_tests.init_container }}
 ---
 apiVersion: v1
 kind: Pod

neutron/values.yaml

@@ -184,6 +184,28 @@ dependencies:
       endpoint: internal
 
 pod:
+  mounts:
+    neutron_server:
+      init_container: null
+      neutron_server:
+    neutron_dhcp_agent:
+      init_container: null
+      neutron_dhcp_agent:
+    neutron_l3_agent:
+      init_container: null
+      neutron_l3_agent:
+    neutron_metadata_agent:
+      init_container: null
+      neutron_metadata_agent:
+    neutron_ovs_agent:
+      init_container: null
+      neutron_ovs_agent:
+    neutron_tests:
+      init_container: null
+      neutron_tests:
+    neutron_bootstrap:
+      init_container: null
+      neutron_bootstrap:
   replicas:
     server: 1
   lifecycle:
@@ -609,26 +631,3 @@ endpoints:
       api:
         default: 9696
         public: 80
-
-mounts:
-  neutron_server:
-    init_container: null
-    neutron_server:
-  neutron_dhcp_agent:
-    init_container: null
-    neutron_dhcp_agent:
-  neutron_l3_agent:
-    init_container: null
-    neutron_l3_agent:
-  neutron_metadata_agent:
-    init_container: null
-    neutron_metadata_agent:
-  neutron_ovs_agent:
-    init_container: null
-    neutron_ovs_agent:
-  neutron_tests:
-    init_container: null
-    neutron_tests:
-  neutron_bootstrap:
-    init_container: null
-    neutron_bootstrap:

nova/templates/daemonset-compute.yaml

@@ -14,8 +14,8 @@
 
 {{- $envAll := . }}
 {{- $dependencies := .Values.dependencies.compute }}
-{{- $mounts_nova_compute := .Values.mounts.nova_compute.nova_compute }}
+{{- $mounts_nova_compute := .Values.pod.mounts.nova_compute.nova_compute }}
-{{- $mounts_nova_compute_init := .Values.mounts.nova_compute.init_container }}
+{{- $mounts_nova_compute_init := .Values.pod.mounts.nova_compute.init_container }}
 ---
 apiVersion: extensions/v1beta1
 kind: DaemonSet

nova/templates/daemonset-libvirt.yaml

@@ -14,8 +14,8 @@
 
 {{- $envAll := . }}
 {{- $dependencies := .Values.dependencies.libvirt }}
-{{- $mounts_nova_libvirt := .Values.mounts.nova_libvirt.nova_libvirt }}
+{{- $mounts_nova_libvirt := .Values.pod.mounts.nova_libvirt.nova_libvirt }}
-{{- $mounts_nova_libvirt_init := .Values.mounts.nova_libvirt.init_container }}
+{{- $mounts_nova_libvirt_init := .Values.pod.mounts.nova_libvirt.init_container }}
 ---
 apiVersion: extensions/v1beta1
 kind: DaemonSet

nova/templates/deployment-api-metadata.yaml

@@ -14,8 +14,8 @@
 
 {{- $envAll := . }}
 {{- $dependencies := .Values.dependencies.api }}
-{{- $mounts_nova_api_metadata := .Values.mounts.nova_api_metadata.nova_api_metadata }}
+{{- $mounts_nova_api_metadata := .Values.pod.mounts.nova_api_metadata.nova_api_metadata }}
-{{- $mounts_nova_api_metadata_init := .Values.mounts.nova_api_metadata.init_container }}
+{{- $mounts_nova_api_metadata_init := .Values.pod.mounts.nova_api_metadata.init_container }}
 ---
 apiVersion: apps/v1beta1
 kind: Deployment

nova/templates/deployment-api-osapi.yaml

@@ -14,8 +14,8 @@
 
 {{- $envAll := . }}
 {{- $dependencies := .Values.dependencies.api }}
-{{- $mounts_nova_api_osapi := .Values.mounts.nova_api_osapi.nova_api_osapi }}
+{{- $mounts_nova_api_osapi := .Values.pod.mounts.nova_api_osapi.nova_api_osapi }}
-{{- $mounts_nova_api_osapi_init := .Values.mounts.nova_api_osapi.init_container }}
+{{- $mounts_nova_api_osapi_init := .Values.pod.mounts.nova_api_osapi.init_container }}
 ---
 apiVersion: apps/v1beta1
 kind: Deployment

nova/templates/deployment-conductor.yaml

@@ -14,8 +14,8 @@
 
 {{- $envAll := . }}
 {{- $dependencies := .Values.dependencies.conductor }}
-{{- $mounts_nova_conductor := .Values.mounts.nova_conductor.nova_conductor }}
+{{- $mounts_nova_conductor := .Values.pod.mounts.nova_conductor.nova_conductor }}
-{{- $mounts_nova_conductor_init := .Values.mounts.nova_conductor.init_container }}
+{{- $mounts_nova_conductor_init := .Values.pod.mounts.nova_conductor.init_container }}
 ---
 apiVersion: apps/v1beta1
 kind: Deployment

nova/templates/deployment-consoleauth.yaml

@@ -14,8 +14,8 @@
 
 {{- $envAll := . }}
 {{- $dependencies := .Values.dependencies.consoleauth }}
-{{- $mounts_nova_consoleauth := .Values.mounts.nova_consoleauth.nova_conductor }}
+{{- $mounts_nova_consoleauth := .Values.pod.mounts.nova_consoleauth.nova_conductor }}
-{{- $mounts_nova_consoleauth_init := .Values.mounts.nova_consoleauth.init_container }}
+{{- $mounts_nova_consoleauth_init := .Values.pod.mounts.nova_consoleauth.init_container }}
 ---
 apiVersion: apps/v1beta1
 kind: Deployment

nova/templates/deployment-novncproxy.yaml

@@ -15,8 +15,8 @@
 {{- $envAll := . }}
 {{ if eq .Values.console.console_kind "novnc" }}
 {{- $dependencies := .Values.dependencies.novncproxy }}
-{{- $mounts_nova_novncproxy := .Values.mounts.nova_novncproxy.nova_novncproxy }}
+{{- $mounts_nova_novncproxy := .Values.pod.mounts.nova_novncproxy.nova_novncproxy }}
-{{- $mounts_nova_novncproxy_init := .Values.mounts.nova_novncproxy.init_novncproxy }}
+{{- $mounts_nova_novncproxy_init := .Values.pod.mounts.nova_novncproxy.init_novncproxy }}
 ---
 apiVersion: apps/v1beta1
 kind: Deployment

nova/templates/deployment-scheduler.yaml

@@ -14,8 +14,8 @@
 
 {{- $envAll := . }}
 {{- $dependencies := .Values.dependencies.scheduler }}
-{{- $mounts_nova_scheduler := .Values.mounts.nova_scheduler.nova_conductor }}
+{{- $mounts_nova_scheduler := .Values.pod.mounts.nova_scheduler.nova_conductor }}
-{{- $mounts_nova_scheduler_init := .Values.mounts.nova_scheduler.init_container }}
+{{- $mounts_nova_scheduler_init := .Values.pod.mounts.nova_scheduler.init_container }}
 ---
 apiVersion: apps/v1beta1
 kind: Deployment

nova/templates/job-bootstrap.yaml

@@ -14,8 +14,8 @@
 
 {{- $envAll := . }}
 {{- $dependencies := .Values.dependencies.bootstrap }}
-{{- $mounts_nova_bootstrap := .Values.mounts.nova_bootstrap.nova_bootstrap }}
+{{- $mounts_nova_bootstrap := .Values.pod.mounts.nova_bootstrap.nova_bootstrap }}
-{{- $mounts_nova_bootstrap_init := .Values.mounts.nova_bootstrap.init_container }}
+{{- $mounts_nova_bootstrap_init := .Values.pod.mounts.nova_bootstrap.init_container }}
 ---
 apiVersion: batch/v1
 kind: Job

nova/templates/pod-rally-test.yaml

@@ -14,8 +14,8 @@
 
 {{- $envAll := . }}
 {{- $dependencies := .Values.dependencies.tests }}
-{{- $mounts_nova_tests := .Values.mounts.nova_tests.nova_tests }}
+{{- $mounts_nova_tests := .Values.pod.mounts.nova_tests.nova_tests }}
-{{- $mounts_nova_tests_init := .Values.mounts.nova_tests.init_container }}
+{{- $mounts_nova_tests_init := .Values.pod.mounts.nova_tests.init_container }}
 ---
 apiVersion: v1
 kind: Pod

nova/values.yaml

@@ -228,38 +228,6 @@ dependencies:
     - service: oslo_db
       endpoint: internal
 
-mounts:
-  nova_compute:
-    init_container: null
-    nova_compute:
-  nova_libvirt:
-    init_container: null
-    nova_libvirt:
-  nova_api_metadata:
-    init_container: null
-    nova_api_metadata:
-  nova_api_osapi:
-    init_container: null
-    nova_api_osapi:
-  nova_consoleauth:
-    init_container: null
-    nova_consoleauth:
-  nova_conductor:
-    init_container: null
-    nova_conductor:
-  nova_scheduler:
-    init_container: null
-    nova_scheduler:
-  nova_bootstrap:
-    init_container: null
-    nova_bootstrap:
-  nova_tests:
-    init_container: null
-    nova_tests:
-  nova_novncproxy:
-    init_novncproxy: null
-    nova_novncproxy:
-
 console:
   # serial | spice | novnc | none
   console_kind: novnc
@@ -548,6 +516,37 @@ endpoints:
         public: 80
 
 pod:
+  mounts:
+    nova_compute:
+      init_container: null
+      nova_compute:
+    nova_libvirt:
+      init_container: null
+      nova_libvirt:
+    nova_api_metadata:
+      init_container: null
+      nova_api_metadata:
+    nova_api_osapi:
+      init_container: null
+      nova_api_osapi:
+    nova_consoleauth:
+      init_container: null
+      nova_consoleauth:
+    nova_conductor:
+      init_container: null
+      nova_conductor:
+    nova_scheduler:
+      init_container: null
+      nova_scheduler:
+    nova_bootstrap:
+      init_container: null
+      nova_bootstrap:
+    nova_tests:
+      init_container: null
+      nova_tests:
+    nova_novncproxy:
+      init_novncproxy: null
+      nova_novncproxy:
   replicas:
     api_metadata: 1
     osapi: 1

senlin/templates/deployment-api.yaml

@@ -14,8 +14,8 @@
 
 {{- $envAll := . }}
 {{- $dependencies := .Values.dependencies.api }}
-{{- $mounts_senlin_api := .Values.mounts.senlin_api.senlin_api }}
+{{- $mounts_senlin_api := .Values.pod.mounts.senlin_api.senlin_api }}
-{{- $mounts_senlin_api_init := .Values.mounts.senlin_api.init_container }}
+{{- $mounts_senlin_api_init := .Values.pod.mounts.senlin_api.init_container }}
 ---
 apiVersion: apps/v1beta1
 kind: Deployment

senlin/templates/job-bootstrap.yaml

@@ -15,8 +15,8 @@
 {{- $envAll := . }}
 {{- if .Values.bootstrap.enabled }}
 {{- $dependencies := .Values.dependencies.bootstrap }}
-{{- $mounts_senlin_bootstrap := .Values.mounts.senlin_bootstrap.senlin_bootstrap }}
+{{- $mounts_senlin_bootstrap := .Values.pod.mounts.senlin_bootstrap.senlin_bootstrap }}
-{{- $mounts_senlin_bootstrap_init := .Values.mounts.senlin_bootstrap.init_container }}
+{{- $mounts_senlin_bootstrap_init := .Values.pod.mounts.senlin_bootstrap.init_container }}
 ---
 apiVersion: batch/v1
 kind: Job

senlin/templates/statefulset-engine.yaml

@@ -14,8 +14,8 @@
 
 {{- $envAll := . }}
 {{- $dependencies := .Values.dependencies.engine }}
-{{- $mounts_senlin_engine := .Values.mounts.senlin_engine.senlin_engine }}
+{{- $mounts_senlin_engine := .Values.pod.mounts.senlin_engine.senlin_engine }}
-{{- $mounts_senlin_engine_init := .Values.mounts.senlin_engine.init_container }}
+{{- $mounts_senlin_engine_init := .Values.pod.mounts.senlin_engine.init_container }}
 ---
 apiVersion: apps/v1beta1
 kind: StatefulSet

senlin/values.yaml

@@ -206,6 +206,16 @@ endpoints:
         default: 5672
 
 pod:
+  mounts:
+    senlin_api:
+      init_container: null
+      senlin_api:
+    senlin_engine:
+      init_container: null
+      senlin_engine:
+    senlin_bootstrap:
+      init_container: null
+      senlin_bootstrap:
   replicas:
     api: 1
     engine: 1
@@ -289,14 +299,3 @@ pod:
         limits:
           memory: "1024Mi"
           cpu: "2000m"
-
-mounts:
-  senlin_api:
-    init_container: null
-    senlin_api:
-  senlin_engine:
-    init_container: null
-    senlin_engine:
-  senlin_bootstrap:
-    init_container: null
-    senlin_bootstrap: