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
This commit is contained in:
parent
7472974179
commit
af7588600d
|
@ -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
|
||||||
|
|
Loading…
Reference in New Issue