From af7588600d0dc8bda33b5f3f37df67640864d350 Mon Sep 17 00:00:00 2001 From: Pavlo Shchelokovskyy Date: Fri, 31 May 2019 13:59:18 +0000 Subject: [PATCH] Do not re-clone heat in devstack plugin devstack already clones the source from the repo/ref provided to enable_plugin function. Having to re-clone heat effectively requires to also set HEAT_BRANCH separately which is unnecessary repetition and make it less obvious how to deploy Devstack+Heat from stable branches locally w/o Zuul Cloner with RECLONE=true. Change-Id: I91b5048efa4606e86094e0a458e320216f66ce3e --- devstack/lib/heat | 5 ----- 1 file changed, 5 deletions(-) diff --git a/devstack/lib/heat b/devstack/lib/heat index 82e88e6c33..f30e4bff4b 100644 --- a/devstack/lib/heat +++ b/devstack/lib/heat @@ -31,10 +31,6 @@ set +o xtrace # set up default directories GITDIR["python-heatclient"]=$DEST/python-heatclient -# heat service -HEAT_REPO=${HEAT_REPO:-${GIT_BASE}/openstack/heat.git} -HEAT_BRANCH=${HEAT_BRANCH:-master} - # python heat client library GITREPO["python-heatclient"]=${HEATCLIENT_REPO:-${GIT_BASE}/openstack/python-heatclient.git} GITBRANCH["python-heatclient"]=${HEATCLIENT_BRANCH:-master} @@ -276,7 +272,6 @@ function install_heatclient { # install_heat() - Collect source and prepare function install_heat { - git_clone $HEAT_REPO $HEAT_DIR $HEAT_BRANCH setup_develop $HEAT_DIR if [[ "$HEAT_USE_APACHE" == "True" ]]; then if [ "$WSGI_MODE" == "uwsgi" ]; then