openstack
/
heat
Code Issues Proposed changes

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
parent 77fdf8a4b7 af7588600d
commit 0e6b8c6c13
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
devstack/lib/heat
View File

@ -31,10 +31,6 @@ set +o xtrace
# set up default directories # set up default directories
GITDIR["python-heatclient"]=$DEST/python-heatclient 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 # python heat client library
GITREPO["python-heatclient"]=${HEATCLIENT_REPO:-${GIT_BASE}/openstack/python-heatclient.git} GITREPO["python-heatclient"]=${HEATCLIENT_REPO:-${GIT_BASE}/openstack/python-heatclient.git}
GITBRANCH["python-heatclient"]=${HEATCLIENT_BRANCH:-master} GITBRANCH["python-heatclient"]=${HEATCLIENT_BRANCH:-master}
@ -276,7 +272,6 @@ function install_heatclient {
# install_heat() - Collect source and prepare # install_heat() - Collect source and prepare
function install_heat { function install_heat {
git_clone $HEAT_REPO $HEAT_DIR $HEAT_BRANCH
setup_develop $HEAT_DIR setup_develop $HEAT_DIR
if [[ "$HEAT_USE_APACHE" == "True" ]]; then if [[ "$HEAT_USE_APACHE" == "True" ]]; then
if [ "$WSGI_MODE" == "uwsgi" ]; then if [ "$WSGI_MODE" == "uwsgi" ]; then