Merge "Fix devstack plugin's usage of RECLONE option"

This commit is contained in:
Jenkins 2014-02-17 10:14:50 +00:00 committed by Gerrit Code Review
commit 21980f84f2
1 changed files with 4 additions and 6 deletions

View File

@ -301,12 +301,10 @@ function init_manila() {
# install_manila() - Collect source and prepare
function install_manila() {
# short hack for development
MAIN_RECLONE=$RECLONE
RECLONE=yes
git_clone $MANILA_REPO $MANILA_DIR $MANILA_BRANCH
git_clone $MANILACLIENT_REPO $MANILACLIENT_DIR $MANILACLIENT_BRANCH
RECLONE=$MAIN_RECLONE
if [[ "$RECLONE" = "True" ]]; then
git_clone $MANILA_REPO $MANILA_DIR $MANILA_BRANCH
git_clone $MANILACLIENT_REPO $MANILACLIENT_DIR $MANILACLIENT_BRANCH
fi
if is_service_enabled m-shr; then
if is_ubuntu; then