Merge "Do not re-clone heat in devstack plugin"

This commit is contained in:
Zuul 2019-09-27 10:10:12 +00:00 committed by Gerrit Code Review
commit 0e6b8c6c13

View File

@ -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