openstack/openstack-helm
Code Issues Proposed changes

Override OSH_EXTRA_HELM_ARGS_CEPH for each chart

Browse Source 
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
This commit is contained in:
Andrii Ostapenko 2019-08-13 19:16:25 -05:00
parent 3af5f78f5c
commit 7904edf818
1 changed files with 6 additions and 2 deletions

8
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