From 163497a421f59dfa4f94f8fb3c93a2c96df1e028 Mon Sep 17 00:00:00 2001 From: Pavlo Shchelokovskyy Date: Wed, 13 Feb 2019 18:35:39 +0000 Subject: [PATCH] Actually add db-drop to ironic chart while the job_db_drop was there it was missing both image, script and limits. Change-Id: I7fdb8fdd33cbe3c086299d7b71922ae889bc0a14 --- ironic/templates/configmap-bin.yaml | 2 ++ ironic/values.yaml | 12 ++++++++++++ 2 files changed, 14 insertions(+) diff --git a/ironic/templates/configmap-bin.yaml b/ironic/templates/configmap-bin.yaml index 1b6852c8eb..4b2d254b67 100644 --- a/ironic/templates/configmap-bin.yaml +++ b/ironic/templates/configmap-bin.yaml @@ -36,6 +36,8 @@ data: {{ tuple "bin/_retreive-cleaning-network.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} retreive-swift-config.sh: | {{ tuple "bin/_retreive-swift-config.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} + db-drop.py: | +{{- include "helm-toolkit.scripts.db_drop" . | indent 4 }} db-init.py: | {{- include "helm-toolkit.scripts.db_init" . | indent 4 }} db-sync.sh: | diff --git a/ironic/values.yaml b/ironic/values.yaml index 5ef2b86303..f78e1ee785 100644 --- a/ironic/values.yaml +++ b/ironic/values.yaml @@ -37,6 +37,7 @@ images: ironic_retrive_swift_config: docker.io/openstackhelm/heat:ocata # Bootstrap image requires curl bootstrap: docker.io/openstackhelm/heat:ocata + db_drop: docker.io/openstackhelm/heat:ocata db_init: docker.io/openstackhelm/heat:ocata ironic_db_sync: docker.io/openstackhelm/ironic:ocata ks_user: docker.io/openstackhelm/heat:ocata @@ -301,6 +302,10 @@ dependencies: service: baremetal - endpoint: internal service: oslo_messaging + db_drop: + services: + - endpoint: internal + service: oslo_db db_init: services: - endpoint: internal @@ -596,6 +601,13 @@ pod: limits: memory: "1024Mi" cpu: "2000m" + db_drop: + requests: + memory: "128Mi" + cpu: "100m" + limits: + memory: "1024Mi" + cpu: "2000m" db_init: requests: memory: "128Mi"