openstack/openstack-helm
Code Issues Proposed changes

Merge "Simplify code for value overrides for ceph"

Browse Source
This commit is contained in:
Zuul 2019-09-25 08:22:48 +00:00 committed by Gerrit Code Review
commit 3d913447c8
2 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -171,18 +171,12 @@ pod:
EOF 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
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_TMP} ${OSH_EXTRA_HELM_ARGS_CEPH:-$(./tools/deployment/common/get-values-overrides.sh ${CHART})}
#NOTE: Wait for deploy #NOTE: Wait for deploy
./tools/deployment/common/wait-for-pods.sh ceph ./tools/deployment/common/wait-for-pods.sh ceph

8
tools/deployment/developer/ceph/040-ceph.sh
View File

@ -161,18 +161,12 @@ pod:
EOF 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
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_TMP} ${OSH_EXTRA_HELM_ARGS_CEPH:-$(./tools/deployment/common/get-values-overrides.sh ${CHART})}
#NOTE: Wait for deploy #NOTE: Wait for deploy
./tools/deployment/common/wait-for-pods.sh ceph ./tools/deployment/common/wait-for-pods.sh ceph