From 7904edf818e56eafdf02650b96a25e18e60f8b5f Mon Sep 17 00:00:00 2001 From: Andrii Ostapenko Date: Tue, 13 Aug 2019 19:16:25 -0500 Subject: [PATCH] Override OSH_EXTRA_HELM_ARGS_CEPH for each chart Currently OSH_EXTRA_HELM_ARGS_CEPH is calculated for ceph-mon only and the same value is used for other charts from loop. Change-Id: Ia014310ab675e4f58c224aae1139dfb3a065766b --- tools/deployment/component/ceph/ceph.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/deployment/component/ceph/ceph.sh b/tools/deployment/component/ceph/ceph.sh index 49795be503..3a9ea9d0f3 100755 --- a/tools/deployment/component/ceph/ceph.sh +++ b/tools/deployment/component/ceph/ceph.sh @@ -172,13 +172,17 @@ EOF for CHART in ceph-mon ceph-osd ceph-client ceph-provisioners; do #NOTE: Get the over-rides to use - : ${OSH_EXTRA_HELM_ARGS_CEPH:="$(./tools/deployment/common/get-values-overrides.sh ${CHART})"} + if [ -z "${OSH_EXTRA_HELM_ARGS_CEPH}" ]; then + OSH_EXTRA_HELM_ARGS_CEPH_TMP="$(./tools/deployment/common/get-values-overrides.sh ${CHART})" + else + OSH_EXTRA_HELM_ARGS_CEPH_TMP="${OSH_EXTRA_HELM_ARGS_CEPH}" + fi helm upgrade --install ${CHART} ${HELM_CHART_ROOT_PATH}/${CHART} \ --namespace=ceph \ --values=/tmp/ceph.yaml \ ${OSH_EXTRA_HELM_ARGS:=} \ - ${OSH_EXTRA_HELM_ARGS_CEPH} + ${OSH_EXTRA_HELM_ARGS_CEPH_TMP} #NOTE: Wait for deploy ./tools/deployment/common/wait-for-pods.sh ceph