openstack/openstack-helm
Code Issues Proposed changes

Merge "Override OSH_EXTRA_HELM_ARGS_CEPH for each chart"

Browse Source
This commit is contained in:
Zuul 2019-08-27 17:37:08 +00:00 committed by Gerrit Code Review
commit 864d7ab8c7
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/deployment/component/ceph/ceph.sh
View File

@ -172,13 +172,17 @@ EOF
for CHART in ceph-mon ceph-osd ceph-client ceph-provisioners; do for CHART in ceph-mon ceph-osd ceph-client ceph-provisioners; do
#NOTE: Get the over-rides to use #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} \ helm upgrade --install ${CHART} ${HELM_CHART_ROOT_PATH}/${CHART} \
--namespace=ceph \ --namespace=ceph \
--values=/tmp/ceph.yaml \ --values=/tmp/ceph.yaml \
${OSH_EXTRA_HELM_ARGS:=} \ ${OSH_EXTRA_HELM_ARGS:=} \
${OSH_EXTRA_HELM_ARGS_CEPH} ${OSH_EXTRA_HELM_ARGS_CEPH_TMP}
#NOTE: Wait for deploy #NOTE: Wait for deploy
./tools/deployment/common/wait-for-pods.sh ceph ./tools/deployment/common/wait-for-pods.sh ceph