From fd6ad0bab42797c59456017fcbdd0a74cad4f059 Mon Sep 17 00:00:00 2001 From: jinyuanliu Date: Wed, 27 Jan 2021 07:21:41 -0500 Subject: [PATCH] Bug for build helm-toolkit About helm-toolkit chart, you should to path run the script when build helm-toolkit, not here.Otherwise, the old code will not work here. Change-Id: Ic3ee9209742a74153935faa7de20411461eabef8 --- tools/deployment/common/setup-client.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/deployment/common/setup-client.sh b/tools/deployment/common/setup-client.sh index a84c3b5cbf..65fe342b2d 100755 --- a/tools/deployment/common/setup-client.sh +++ b/tools/deployment/common/setup-client.sh @@ -18,6 +18,8 @@ sudo -H -E pip3 install \ -c${UPPER_CONSTRAINTS_FILE:=https://releases.openstack.org/constraints/upper/${OPENSTACK_RELEASE:-stein}} \ cmd2 python-openstackclient python-heatclient --ignore-installed +export HELM_CHART_ROOT_PATH="${HELM_CHART_ROOT_PATH:="${OSH_INFRA_PATH:="../openstack-helm-infra"}"}" + sudo -H mkdir -p /etc/openstack sudo -H chown -R $(id -un): /etc/openstack FEATURE_GATE="tls"; if [[ ${FEATURE_GATES//,/ } =~ (^|[[:space:]])${FEATURE_GATE}($|[[:space:]]) ]]; then @@ -52,4 +54,4 @@ EOF fi #NOTE: Build helm-toolkit, most charts depend on helm-toolkit -make helm-toolkit +make -C ${HELM_CHART_ROOT_PATH} helm-toolkit