From cbae720d1dc4398eebfe22bed888f9ad965b6836 Mon Sep 17 00:00:00 2001 From: Pete Birley Date: Fri, 14 Jul 2017 10:44:35 -0500 Subject: [PATCH] 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 | 4 +- barbican/templates/job-bootstrap.yaml | 4 +- barbican/values.yaml | 15 +++-- cinder/templates/deployment-api.yaml | 4 +- cinder/templates/deployment-backup.yaml | 4 +- cinder/templates/deployment-scheduler.yaml | 4 +- cinder/templates/deployment-volume.yaml | 4 +- cinder/templates/pod-rally-test.yaml | 4 +- cinder/values.yaml | 33 +++++----- glance/templates/deployment-api.yaml | 4 +- glance/templates/deployment-registry.yaml | 4 +- glance/templates/pod-rally-test.yaml | 4 +- glance/values.yaml | 21 +++---- heat/templates/deployment-api.yaml | 4 +- heat/templates/deployment-cfn.yaml | 4 +- heat/templates/deployment-cloudwatch.yaml | 4 +- heat/templates/job-bootstrap.yaml | 4 +- heat/templates/statefulset-engine.yaml | 4 +- heat/values.yaml | 33 +++++----- horizon/templates/deployment.yaml | 4 +- horizon/templates/job-db-init.yaml | 4 +- horizon/templates/job-db-sync.yaml | 4 +- horizon/values.yaml | 21 +++---- keystone/templates/deployment-api.yaml | 4 +- keystone/templates/job-bootstrap.yaml | 4 +- keystone/templates/job-db-init.yaml | 4 +- keystone/templates/job-db-sync.yaml | 4 +- keystone/templates/pod-rally-test.yaml | 4 +- keystone/values.yaml | 33 +++++----- magnum/templates/deployment-api.yaml | 4 +- magnum/templates/job-bootstrap.yaml | 4 +- magnum/templates/statefulset-conductor.yaml | 4 +- magnum/values.yaml | 21 +++---- mistral/templates/deployment-api.yaml | 4 +- mistral/templates/deployment-executor.yaml | 4 +- mistral/templates/job-bootstrap.yaml | 4 +- mistral/templates/statefulset-engine.yaml | 4 +- .../templates/statefulset-event-engine.yaml | 4 +- mistral/values.yaml | 33 +++++----- neutron/templates/daemonset-dhcp-agent.yaml | 4 +- neutron/templates/daemonset-l3-agent.yaml | 4 +- .../templates/daemonset-metadata-agent.yaml | 4 +- neutron/templates/daemonset-ovs-agent.yaml | 4 +- neutron/templates/deployment-server.yaml | 4 +- neutron/templates/job-bootstrap.yaml | 4 +- neutron/templates/pod-rally-test.yaml | 4 +- neutron/values.yaml | 45 +++++++------ nova/templates/daemonset-compute.yaml | 4 +- nova/templates/daemonset-libvirt.yaml | 4 +- nova/templates/deployment-api-metadata.yaml | 4 +- nova/templates/deployment-api-osapi.yaml | 4 +- nova/templates/deployment-conductor.yaml | 4 +- nova/templates/deployment-consoleauth.yaml | 4 +- nova/templates/deployment-novncproxy.yaml | 4 +- nova/templates/deployment-scheduler.yaml | 4 +- nova/templates/job-bootstrap.yaml | 4 +- nova/templates/pod-rally-test.yaml | 4 +- nova/values.yaml | 63 +++++++++---------- senlin/templates/deployment-api.yaml | 4 +- senlin/templates/job-bootstrap.yaml | 4 +- senlin/templates/statefulset-engine.yaml | 4 +- senlin/values.yaml | 21 +++---- 62 files changed, 266 insertions(+), 277 deletions(-) diff --git a/barbican/templates/deployment-api.yaml b/barbican/templates/deployment-api.yaml index ef3ee7ce31..dabc99379b 100644 --- a/barbican/templates/deployment-api.yaml +++ b/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_init := .Values.mounts.barbican_api.init_container }} +{{- $mounts_barbican_api := .Values.pod.mounts.barbican_api.barbican_api }} +{{- $mounts_barbican_api_init := .Values.pod.mounts.barbican_api.init_container }} --- apiVersion: apps/v1beta1 kind: Deployment diff --git a/barbican/templates/job-bootstrap.yaml b/barbican/templates/job-bootstrap.yaml index 855e3875f1..0da4e555de 100644 --- a/barbican/templates/job-bootstrap.yaml +++ b/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_init := .Values.mounts.barbican_bootstrap.init_container }} +{{- $mounts_barbican_bootstrap := .Values.pod.mounts.barbican_bootstrap.barbican_bootstrap }} +{{- $mounts_barbican_bootstrap_init := .Values.pod.mounts.barbican_bootstrap.init_container }} --- apiVersion: batch/v1 kind: Job diff --git a/barbican/values.yaml b/barbican/values.yaml index 47b98d0b63..592855d04b 100644 --- a/barbican/values.yaml +++ b/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: diff --git a/cinder/templates/deployment-api.yaml b/cinder/templates/deployment-api.yaml index 3591b2ef40..420023fc2c 100644 --- a/cinder/templates/deployment-api.yaml +++ b/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_init := .Values.mounts.cinder_api.init_container }} +{{- $mounts_cinder_api := .Values.pod.mounts.cinder_api.cinder_api }} +{{- $mounts_cinder_api_init := .Values.pod.mounts.cinder_api.init_container }} --- apiVersion: apps/v1beta1 kind: Deployment diff --git a/cinder/templates/deployment-backup.yaml b/cinder/templates/deployment-backup.yaml index 569e04af9a..f3f9ff3efd 100644 --- a/cinder/templates/deployment-backup.yaml +++ b/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_init := .Values.mounts.cinder_backup.init_container }} +{{- $mounts_cinder_backup := .Values.pod.mounts.cinder_backup.cinder_backup }} +{{- $mounts_cinder_backup_init := .Values.pod.mounts.cinder_backup.init_container }} --- apiVersion: apps/v1beta1 kind: Deployment diff --git a/cinder/templates/deployment-scheduler.yaml b/cinder/templates/deployment-scheduler.yaml index 93a57df0ac..bdeaa9f184 100644 --- a/cinder/templates/deployment-scheduler.yaml +++ b/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_init := .Values.mounts.cinder_scheduler.init_container }} +{{- $mounts_cinder_scheduler := .Values.pod.mounts.cinder_scheduler.cinder_scheduler }} +{{- $mounts_cinder_scheduler_init := .Values.pod.mounts.cinder_scheduler.init_container }} --- apiVersion: apps/v1beta1 kind: Deployment diff --git a/cinder/templates/deployment-volume.yaml b/cinder/templates/deployment-volume.yaml index b85bbbc370..6a14fd03f2 100644 --- a/cinder/templates/deployment-volume.yaml +++ b/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_init := .Values.mounts.cinder_volume.init_container }} +{{- $mounts_cinder_volume := .Values.pod.mounts.cinder_volume.cinder_volume }} +{{- $mounts_cinder_volume_init := .Values.pod.mounts.cinder_volume.init_container }} --- apiVersion: apps/v1beta1 kind: Deployment diff --git a/cinder/templates/pod-rally-test.yaml b/cinder/templates/pod-rally-test.yaml index fa53a5fadf..d258200932 100644 --- a/cinder/templates/pod-rally-test.yaml +++ b/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_init := .Values.mounts.cinder_tests.init_container }} +{{- $mounts_cinder_tests := .Values.pod.mounts.cinder_tests.cinder_tests }} +{{- $mounts_cinder_tests_init := .Values.pod.mounts.cinder_tests.init_container }} --- apiVersion: v1 kind: Pod diff --git a/cinder/values.yaml b/cinder/values.yaml index 52e57fa765..70b8034f82 100644 --- a/cinder/values.yaml +++ b/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: diff --git a/glance/templates/deployment-api.yaml b/glance/templates/deployment-api.yaml index 5efd54243f..ed4dadb752 100644 --- a/glance/templates/deployment-api.yaml +++ b/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_init := .Values.mounts.glance_api.init_container }} +{{- $mounts_glance_api := .Values.pod.mounts.glance_api.glance_api }} +{{- $mounts_glance_api_init := .Values.pod.mounts.glance_api.init_container }} --- apiVersion: apps/v1beta1 kind: Deployment diff --git a/glance/templates/deployment-registry.yaml b/glance/templates/deployment-registry.yaml index 3f73f8dffd..47d4e646d4 100644 --- a/glance/templates/deployment-registry.yaml +++ b/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_init := .Values.mounts.glance_registry.init_container }} +{{- $mounts_glance_registry := .Values.pod.mounts.glance_registry.glance_registry }} +{{- $mounts_glance_registry_init := .Values.pod.mounts.glance_registry.init_container }} --- apiVersion: apps/v1beta1 kind: Deployment diff --git a/glance/templates/pod-rally-test.yaml b/glance/templates/pod-rally-test.yaml index fc7de0a1ce..c388589567 100644 --- a/glance/templates/pod-rally-test.yaml +++ b/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_init := .Values.mounts.glance_tests.init_container }} +{{- $mounts_glance_tests := .Values.pod.mounts.glance_tests.glance_tests }} +{{- $mounts_glance_tests_init := .Values.pod.mounts.glance_tests.init_container }} --- apiVersion: v1 kind: Pod diff --git a/glance/values.yaml b/glance/values.yaml index c039a7048e..577a506f47 100644 --- a/glance/values.yaml +++ b/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 diff --git a/heat/templates/deployment-api.yaml b/heat/templates/deployment-api.yaml index 5a4f9acfc8..baa7c1ba72 100644 --- a/heat/templates/deployment-api.yaml +++ b/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_init := .Values.mounts.heat_api.init_container }} +{{- $mounts_heat_api := .Values.pod.mounts.heat_api.heat_api }} +{{- $mounts_heat_api_init := .Values.pod.mounts.heat_api.init_container }} --- apiVersion: apps/v1beta1 kind: Deployment diff --git a/heat/templates/deployment-cfn.yaml b/heat/templates/deployment-cfn.yaml index 19f1171ed9..87f45a561d 100644 --- a/heat/templates/deployment-cfn.yaml +++ b/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_init := .Values.mounts.heat_cfn.init_container }} +{{- $mounts_heat_cfn := .Values.pod.mounts.heat_cfn.heat_cfn }} +{{- $mounts_heat_cfn_init := .Values.pod.mounts.heat_cfn.init_container }} --- apiVersion: apps/v1beta1 kind: Deployment diff --git a/heat/templates/deployment-cloudwatch.yaml b/heat/templates/deployment-cloudwatch.yaml index 80beaab80d..ff3f923824 100644 --- a/heat/templates/deployment-cloudwatch.yaml +++ b/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_init := .Values.mounts.heat_cloudwatch.init_container }} +{{- $mounts_heat_cloudwatch := .Values.pod.mounts.heat_cloudwatch.heat_cloudwatch }} +{{- $mounts_heat_cloudwatch_init := .Values.pod.mounts.heat_cloudwatch.init_container }} --- apiVersion: apps/v1beta1 kind: Deployment diff --git a/heat/templates/job-bootstrap.yaml b/heat/templates/job-bootstrap.yaml index 225e2c156d..d76037c345 100644 --- a/heat/templates/job-bootstrap.yaml +++ b/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_init := .Values.mounts.heat_bootstrap.init_container }} +{{- $mounts_heat_bootstrap := .Values.pod.mounts.heat_bootstrap.heat_bootstrap }} +{{- $mounts_heat_bootstrap_init := .Values.pod.mounts.heat_bootstrap.init_container }} --- apiVersion: batch/v1 kind: Job diff --git a/heat/templates/statefulset-engine.yaml b/heat/templates/statefulset-engine.yaml index 61078f3804..3ddfc4764f 100644 --- a/heat/templates/statefulset-engine.yaml +++ b/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_init := .Values.mounts.heat_engine.init_container }} +{{- $mounts_heat_engine := .Values.pod.mounts.heat_engine.heat_engine }} +{{- $mounts_heat_engine_init := .Values.pod.mounts.heat_engine.init_container }} --- apiVersion: apps/v1beta1 kind: StatefulSet diff --git a/heat/values.yaml b/heat/values.yaml index 7b7edc6fb3..f0e29f64ed 100644 --- a/heat/values.yaml +++ b/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: diff --git a/horizon/templates/deployment.yaml b/horizon/templates/deployment.yaml index de2d9f1d73..e8916cf11d 100644 --- a/horizon/templates/deployment.yaml +++ b/horizon/templates/deployment.yaml @@ -14,8 +14,8 @@ {{- $envAll := . }} {{- $dependencies := .Values.dependencies.dashboard }} -{{- $mounts_horizon := .Values.mounts.horizon.horizon }} -{{- $mounts_horizon_init := .Values.mounts.horizon.init_container }} +{{- $mounts_horizon := .Values.pod.mounts.horizon.horizon }} +{{- $mounts_horizon_init := .Values.pod.mounts.horizon.init_container }} --- apiVersion: apps/v1beta1 kind: Deployment diff --git a/horizon/templates/job-db-init.yaml b/horizon/templates/job-db-init.yaml index 905101a515..a776b1ffbe 100644 --- a/horizon/templates/job-db-init.yaml +++ b/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_init := .Values.mounts.horizon_db_init.init_container }} +{{- $mounts_horizon_db_init := .Values.pod.mounts.horizon_db_init.horizon_db_init }} +{{- $mounts_horizon_db_init_init := .Values.pod.mounts.horizon_db_init.init_container }} --- apiVersion: batch/v1 kind: Job diff --git a/horizon/templates/job-db-sync.yaml b/horizon/templates/job-db-sync.yaml index e4cf026d62..a047ca5092 100644 --- a/horizon/templates/job-db-sync.yaml +++ b/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_init := .Values.mounts.horizon_db_sync.init_container }} +{{- $mounts_horizon_db_sync := .Values.pod.mounts.horizon_db_sync.horizon_db_sync }} +{{- $mounts_horizon_db_sync_init := .Values.pod.mounts.horizon_db_sync.init_container }} --- apiVersion: batch/v1 kind: Job diff --git a/horizon/values.yaml b/horizon/values.yaml index 2cbc3be136..0dca7fc2ae 100644 --- a/horizon/values.yaml +++ b/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: diff --git a/keystone/templates/deployment-api.yaml b/keystone/templates/deployment-api.yaml index a8e14b8a6d..bde48ca58a 100644 --- a/keystone/templates/deployment-api.yaml +++ b/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_init := .Values.mounts.keystone_api.init_container }} +{{- $mounts_keystone_api := .Values.pod.mounts.keystone_api.keystone_api }} +{{- $mounts_keystone_api_init := .Values.pod.mounts.keystone_api.init_container }} --- apiVersion: apps/v1beta1 kind: Deployment diff --git a/keystone/templates/job-bootstrap.yaml b/keystone/templates/job-bootstrap.yaml index 67fdcac18b..7cf28454dc 100644 --- a/keystone/templates/job-bootstrap.yaml +++ b/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_init := .Values.mounts.keystone_bootstrap.init_container }} +{{- $mounts_keystone_bootstrap := .Values.pod.mounts.keystone_bootstrap.keystone_bootstrap }} +{{- $mounts_keystone_bootstrap_init := .Values.pod.mounts.keystone_bootstrap.init_container }} --- apiVersion: batch/v1 kind: Job diff --git a/keystone/templates/job-db-init.yaml b/keystone/templates/job-db-init.yaml index d5c967032d..79199cd66e 100644 --- a/keystone/templates/job-db-init.yaml +++ b/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_init := .Values.mounts.keystone_db_init.init_container }} +{{- $mounts_keystone_db_init := .Values.pod.mounts.keystone_db_init.keystone_db_init }} +{{- $mounts_keystone_db_init_init := .Values.pod.mounts.keystone_db_init.init_container }} --- apiVersion: batch/v1 kind: Job diff --git a/keystone/templates/job-db-sync.yaml b/keystone/templates/job-db-sync.yaml index 8d97aaaf06..d884f20605 100644 --- a/keystone/templates/job-db-sync.yaml +++ b/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_init := .Values.mounts.keystone_db_sync.init_container }} +{{- $mounts_keystone_db_sync := .Values.pod.mounts.keystone_db_sync.keystone_db_sync }} +{{- $mounts_keystone_db_sync_init := .Values.pod.mounts.keystone_db_sync.init_container }} --- apiVersion: batch/v1 kind: Job diff --git a/keystone/templates/pod-rally-test.yaml b/keystone/templates/pod-rally-test.yaml index 51e5c82f8c..0102667848 100644 --- a/keystone/templates/pod-rally-test.yaml +++ b/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_init := .Values.mounts.keystone_tests.init_container }} +{{- $mounts_keystone_tests := .Values.pod.mounts.keystone_tests.keystone_tests }} +{{- $mounts_keystone_tests_init := .Values.pod.mounts.keystone_tests.init_container }} --- apiVersion: v1 kind: Pod diff --git a/keystone/values.yaml b/keystone/values.yaml index f528112cde..03bd0ac5f7 100644 --- a/keystone/values.yaml +++ b/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: diff --git a/magnum/templates/deployment-api.yaml b/magnum/templates/deployment-api.yaml index 390933821c..d63946dd45 100644 --- a/magnum/templates/deployment-api.yaml +++ b/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_init := .Values.mounts.magnum_api.init_container }} +{{- $mounts_magnum_api := .Values.pod.mounts.magnum_api.magnum_api }} +{{- $mounts_magnum_api_init := .Values.pod.mounts.magnum_api.init_container }} --- apiVersion: apps/v1beta1 kind: Deployment diff --git a/magnum/templates/job-bootstrap.yaml b/magnum/templates/job-bootstrap.yaml index 697db3faca..966c918e41 100644 --- a/magnum/templates/job-bootstrap.yaml +++ b/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_init := .Values.mounts.magnum_bootstrap.init_container }} +{{- $mounts_magnum_bootstrap := .Values.pod.mounts.magnum_bootstrap.magnum_bootstrap }} +{{- $mounts_magnum_bootstrap_init := .Values.pod.mounts.magnum_bootstrap.init_container }} --- apiVersion: batch/v1 kind: Job diff --git a/magnum/templates/statefulset-conductor.yaml b/magnum/templates/statefulset-conductor.yaml index 4cbcadf588..dd4d856d21 100644 --- a/magnum/templates/statefulset-conductor.yaml +++ b/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_init := .Values.mounts.magnum_conductor.init_container }} +{{- $mounts_magnum_conductor := .Values.pod.mounts.magnum_conductor.magnum_conductor }} +{{- $mounts_magnum_conductor_init := .Values.pod.mounts.magnum_conductor.init_container }} --- apiVersion: apps/v1beta1 kind: StatefulSet diff --git a/magnum/values.yaml b/magnum/values.yaml index c743c4777b..8e8a34a64a 100644 --- a/magnum/values.yaml +++ b/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: diff --git a/mistral/templates/deployment-api.yaml b/mistral/templates/deployment-api.yaml index 2f6e60115a..fd09ea9d56 100644 --- a/mistral/templates/deployment-api.yaml +++ b/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_init := .Values.mounts.mistral_api.init_container }} +{{- $mounts_mistral_api := .Values.pod.mounts.mistral_api.mistral_api }} +{{- $mounts_mistral_api_init := .Values.pod.mounts.mistral_api.init_container }} --- apiVersion: apps/v1beta1 kind: Deployment diff --git a/mistral/templates/deployment-executor.yaml b/mistral/templates/deployment-executor.yaml index e3f8692725..54cd04fed1 100644 --- a/mistral/templates/deployment-executor.yaml +++ b/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_init := .Values.mounts.mistral_executor.init_container }} +{{- $mounts_mistral_executor := .Values.pod.mounts.mistral_executor.mistral_executor }} +{{- $mounts_mistral_executor_init := .Values.pod.mounts.mistral_executor.init_container }} --- apiVersion: apps/v1beta1 kind: Deployment diff --git a/mistral/templates/job-bootstrap.yaml b/mistral/templates/job-bootstrap.yaml index c6e03f947a..cf62d19dc5 100644 --- a/mistral/templates/job-bootstrap.yaml +++ b/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_init := .Values.mounts.mistral_bootstrap.init_container }} +{{- $mounts_mistral_bootstrap := .Values.pod.mounts.mistral_bootstrap.mistral_bootstrap }} +{{- $mounts_mistral_bootstrap_init := .Values.pod.mounts.mistral_bootstrap.init_container }} --- apiVersion: batch/v1 kind: Job diff --git a/mistral/templates/statefulset-engine.yaml b/mistral/templates/statefulset-engine.yaml index 4973f7cdc9..9aa121105c 100644 --- a/mistral/templates/statefulset-engine.yaml +++ b/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_init := .Values.mounts.mistral_engine.init_container }} +{{- $mounts_mistral_engine := .Values.pod.mounts.mistral_engine.mistral_engine }} +{{- $mounts_mistral_engine_init := .Values.pod.mounts.mistral_engine.init_container }} --- apiVersion: apps/v1beta1 kind: StatefulSet diff --git a/mistral/templates/statefulset-event-engine.yaml b/mistral/templates/statefulset-event-engine.yaml index cba8ce028a..f82a4f408b 100644 --- a/mistral/templates/statefulset-event-engine.yaml +++ b/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_init := .Values.mounts.mistral_event_engine.init_container }} +{{- $mounts_mistral_event_engine := .Values.pod.mounts.mistral_event_engine.mistral_event_engine }} +{{- $mounts_mistral_event_engine_init := .Values.pod.mounts.mistral_event_engine.init_container }} --- apiVersion: apps/v1beta1 kind: StatefulSet diff --git a/mistral/values.yaml b/mistral/values.yaml index 349cfb32e6..d5e435473a 100644 --- a/mistral/values.yaml +++ b/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 diff --git a/neutron/templates/daemonset-dhcp-agent.yaml b/neutron/templates/daemonset-dhcp-agent.yaml index fa0b1117b5..efc1a8aac3 100644 --- a/neutron/templates/daemonset-dhcp-agent.yaml +++ b/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_init := .Values.mounts.neutron_dhcp_agent.init_container }} +{{- $mounts_neutron_dhcp_agent := .Values.pod.mounts.neutron_dhcp_agent.neutron_dhcp_agent }} +{{- $mounts_neutron_dhcp_agent_init := .Values.pod.mounts.neutron_dhcp_agent.init_container }} --- apiVersion: extensions/v1beta1 kind: DaemonSet diff --git a/neutron/templates/daemonset-l3-agent.yaml b/neutron/templates/daemonset-l3-agent.yaml index 74f50531b8..0bfda7ac7d 100644 --- a/neutron/templates/daemonset-l3-agent.yaml +++ b/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_init := .Values.mounts.neutron_l3_agent.init_container }} +{{- $mounts_neutron_l3_agent := .Values.pod.mounts.neutron_l3_agent.neutron_l3_agent }} +{{- $mounts_neutron_l3_agent_init := .Values.pod.mounts.neutron_l3_agent.init_container }} --- apiVersion: extensions/v1beta1 kind: DaemonSet diff --git a/neutron/templates/daemonset-metadata-agent.yaml b/neutron/templates/daemonset-metadata-agent.yaml index c05e804b11..2ea7c1fef8 100644 --- a/neutron/templates/daemonset-metadata-agent.yaml +++ b/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_init := .Values.mounts.neutron_metadata_agent.init_container }} +{{- $mounts_neutron_metadata_agent := .Values.pod.mounts.neutron_metadata_agent.neutron_metadata_agent }} +{{- $mounts_neutron_metadata_agent_init := .Values.pod.mounts.neutron_metadata_agent.init_container }} --- apiVersion: extensions/v1beta1 kind: DaemonSet diff --git a/neutron/templates/daemonset-ovs-agent.yaml b/neutron/templates/daemonset-ovs-agent.yaml index 9d974b8a03..018278cfe9 100644 --- a/neutron/templates/daemonset-ovs-agent.yaml +++ b/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_init := .Values.mounts.neutron_ovs_agent.init_container }} +{{- $mounts_neutron_ovs_agent := .Values.pod.mounts.neutron_ovs_agent.neutron_ovs_agent }} +{{- $mounts_neutron_ovs_agent_init := .Values.pod.mounts.neutron_ovs_agent.init_container }} --- apiVersion: extensions/v1beta1 kind: DaemonSet diff --git a/neutron/templates/deployment-server.yaml b/neutron/templates/deployment-server.yaml index fa9574f60c..f35d900753 100644 --- a/neutron/templates/deployment-server.yaml +++ b/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_init := .Values.mounts.neutron_server.init_container }} +{{- $mounts_neutron_server := .Values.pod.mounts.neutron_server.neutron_server }} +{{- $mounts_neutron_server_init := .Values.pod.mounts.neutron_server.init_container }} --- apiVersion: apps/v1beta1 kind: Deployment diff --git a/neutron/templates/job-bootstrap.yaml b/neutron/templates/job-bootstrap.yaml index 6466f77702..52ebb5667f 100644 --- a/neutron/templates/job-bootstrap.yaml +++ b/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_init := .Values.mounts.neutron_bootstrap.init_container }} +{{- $mounts_neutron_bootstrap := .Values.pod.mounts.neutron_bootstrap.neutron_bootstrap }} +{{- $mounts_neutron_bootstrap_init := .Values.pod.mounts.neutron_bootstrap.init_container }} --- apiVersion: batch/v1 kind: Job diff --git a/neutron/templates/pod-rally-test.yaml b/neutron/templates/pod-rally-test.yaml index 55d1f00a46..fb7fae2d9a 100644 --- a/neutron/templates/pod-rally-test.yaml +++ b/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_init := .Values.mounts.neutron_tests.init_container }} +{{- $mounts_neutron_tests := .Values.pod.mounts.neutron_tests.neutron_tests }} +{{- $mounts_neutron_tests_init := .Values.pod.mounts.neutron_tests.init_container }} --- apiVersion: v1 kind: Pod diff --git a/neutron/values.yaml b/neutron/values.yaml index 8bb1cdf719..f4bfd7b7b0 100644 --- a/neutron/values.yaml +++ b/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: diff --git a/nova/templates/daemonset-compute.yaml b/nova/templates/daemonset-compute.yaml index c644b7865b..0b09677d28 100644 --- a/nova/templates/daemonset-compute.yaml +++ b/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_init := .Values.mounts.nova_compute.init_container }} +{{- $mounts_nova_compute := .Values.pod.mounts.nova_compute.nova_compute }} +{{- $mounts_nova_compute_init := .Values.pod.mounts.nova_compute.init_container }} --- apiVersion: extensions/v1beta1 kind: DaemonSet diff --git a/nova/templates/daemonset-libvirt.yaml b/nova/templates/daemonset-libvirt.yaml index 57ba27ba65..38417b64b3 100644 --- a/nova/templates/daemonset-libvirt.yaml +++ b/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_init := .Values.mounts.nova_libvirt.init_container }} +{{- $mounts_nova_libvirt := .Values.pod.mounts.nova_libvirt.nova_libvirt }} +{{- $mounts_nova_libvirt_init := .Values.pod.mounts.nova_libvirt.init_container }} --- apiVersion: extensions/v1beta1 kind: DaemonSet diff --git a/nova/templates/deployment-api-metadata.yaml b/nova/templates/deployment-api-metadata.yaml index b6ca80da9a..ffa9ba60d8 100644 --- a/nova/templates/deployment-api-metadata.yaml +++ b/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_init := .Values.mounts.nova_api_metadata.init_container }} +{{- $mounts_nova_api_metadata := .Values.pod.mounts.nova_api_metadata.nova_api_metadata }} +{{- $mounts_nova_api_metadata_init := .Values.pod.mounts.nova_api_metadata.init_container }} --- apiVersion: apps/v1beta1 kind: Deployment diff --git a/nova/templates/deployment-api-osapi.yaml b/nova/templates/deployment-api-osapi.yaml index a01e975f72..33b50e32cf 100644 --- a/nova/templates/deployment-api-osapi.yaml +++ b/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_init := .Values.mounts.nova_api_osapi.init_container }} +{{- $mounts_nova_api_osapi := .Values.pod.mounts.nova_api_osapi.nova_api_osapi }} +{{- $mounts_nova_api_osapi_init := .Values.pod.mounts.nova_api_osapi.init_container }} --- apiVersion: apps/v1beta1 kind: Deployment diff --git a/nova/templates/deployment-conductor.yaml b/nova/templates/deployment-conductor.yaml index bba540f015..326f2b56e9 100644 --- a/nova/templates/deployment-conductor.yaml +++ b/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_init := .Values.mounts.nova_conductor.init_container }} +{{- $mounts_nova_conductor := .Values.pod.mounts.nova_conductor.nova_conductor }} +{{- $mounts_nova_conductor_init := .Values.pod.mounts.nova_conductor.init_container }} --- apiVersion: apps/v1beta1 kind: Deployment diff --git a/nova/templates/deployment-consoleauth.yaml b/nova/templates/deployment-consoleauth.yaml index 739fd3b460..952c2382b2 100644 --- a/nova/templates/deployment-consoleauth.yaml +++ b/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_init := .Values.mounts.nova_consoleauth.init_container }} +{{- $mounts_nova_consoleauth := .Values.pod.mounts.nova_consoleauth.nova_conductor }} +{{- $mounts_nova_consoleauth_init := .Values.pod.mounts.nova_consoleauth.init_container }} --- apiVersion: apps/v1beta1 kind: Deployment diff --git a/nova/templates/deployment-novncproxy.yaml b/nova/templates/deployment-novncproxy.yaml index ab32163c83..adbfae4fd4 100644 --- a/nova/templates/deployment-novncproxy.yaml +++ b/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_init := .Values.mounts.nova_novncproxy.init_novncproxy }} +{{- $mounts_nova_novncproxy := .Values.pod.mounts.nova_novncproxy.nova_novncproxy }} +{{- $mounts_nova_novncproxy_init := .Values.pod.mounts.nova_novncproxy.init_novncproxy }} --- apiVersion: apps/v1beta1 kind: Deployment diff --git a/nova/templates/deployment-scheduler.yaml b/nova/templates/deployment-scheduler.yaml index 8fe8a4b097..620f497cf9 100644 --- a/nova/templates/deployment-scheduler.yaml +++ b/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_init := .Values.mounts.nova_scheduler.init_container }} +{{- $mounts_nova_scheduler := .Values.pod.mounts.nova_scheduler.nova_conductor }} +{{- $mounts_nova_scheduler_init := .Values.pod.mounts.nova_scheduler.init_container }} --- apiVersion: apps/v1beta1 kind: Deployment diff --git a/nova/templates/job-bootstrap.yaml b/nova/templates/job-bootstrap.yaml index 754990642a..194d270c63 100644 --- a/nova/templates/job-bootstrap.yaml +++ b/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_init := .Values.mounts.nova_bootstrap.init_container }} +{{- $mounts_nova_bootstrap := .Values.pod.mounts.nova_bootstrap.nova_bootstrap }} +{{- $mounts_nova_bootstrap_init := .Values.pod.mounts.nova_bootstrap.init_container }} --- apiVersion: batch/v1 kind: Job diff --git a/nova/templates/pod-rally-test.yaml b/nova/templates/pod-rally-test.yaml index feba24efc7..edd6ff7396 100644 --- a/nova/templates/pod-rally-test.yaml +++ b/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_init := .Values.mounts.nova_tests.init_container }} +{{- $mounts_nova_tests := .Values.pod.mounts.nova_tests.nova_tests }} +{{- $mounts_nova_tests_init := .Values.pod.mounts.nova_tests.init_container }} --- apiVersion: v1 kind: Pod diff --git a/nova/values.yaml b/nova/values.yaml index 3737698621..fb6e2f202d 100644 --- a/nova/values.yaml +++ b/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 diff --git a/senlin/templates/deployment-api.yaml b/senlin/templates/deployment-api.yaml index dcaaa84cf8..9ec20fd317 100644 --- a/senlin/templates/deployment-api.yaml +++ b/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_init := .Values.mounts.senlin_api.init_container }} +{{- $mounts_senlin_api := .Values.pod.mounts.senlin_api.senlin_api }} +{{- $mounts_senlin_api_init := .Values.pod.mounts.senlin_api.init_container }} --- apiVersion: apps/v1beta1 kind: Deployment diff --git a/senlin/templates/job-bootstrap.yaml b/senlin/templates/job-bootstrap.yaml index 39aad55d72..390f9c35b1 100644 --- a/senlin/templates/job-bootstrap.yaml +++ b/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_init := .Values.mounts.senlin_bootstrap.init_container }} +{{- $mounts_senlin_bootstrap := .Values.pod.mounts.senlin_bootstrap.senlin_bootstrap }} +{{- $mounts_senlin_bootstrap_init := .Values.pod.mounts.senlin_bootstrap.init_container }} --- apiVersion: batch/v1 kind: Job diff --git a/senlin/templates/statefulset-engine.yaml b/senlin/templates/statefulset-engine.yaml index 27fe6244db..8880c0b8e5 100644 --- a/senlin/templates/statefulset-engine.yaml +++ b/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_init := .Values.mounts.senlin_engine.init_container }} +{{- $mounts_senlin_engine := .Values.pod.mounts.senlin_engine.senlin_engine }} +{{- $mounts_senlin_engine_init := .Values.pod.mounts.senlin_engine.init_container }} --- apiVersion: apps/v1beta1 kind: StatefulSet diff --git a/senlin/values.yaml b/senlin/values.yaml index a75dd28935..da649dd78c 100644 --- a/senlin/values.yaml +++ b/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: