Merge "Fix stackforge_libs installation step"
This commit is contained in:
commit
202677ae30
22
functions
22
functions
@ -1251,7 +1251,11 @@ function safe_chmod() {
|
|||||||
|
|
||||||
# ``pip install -e`` the package, which processes the dependencies
|
# ``pip install -e`` the package, which processes the dependencies
|
||||||
# using pip before running `setup.py develop`
|
# using pip before running `setup.py develop`
|
||||||
# Uses globals ``STACK_USER``, ``TRACK_DEPENDS``, ``REQUIREMENTS_DIR``
|
#
|
||||||
|
# Updates the dependencies in project_dir from the
|
||||||
|
# openstack/requirements global list before installing anything.
|
||||||
|
#
|
||||||
|
# Uses globals ``TRACK_DEPENDS``, ``REQUIREMENTS_DIR``
|
||||||
# setup_develop directory
|
# setup_develop directory
|
||||||
function setup_develop() {
|
function setup_develop() {
|
||||||
local project_dir=$1
|
local project_dir=$1
|
||||||
@ -1267,9 +1271,7 @@ function setup_develop() {
|
|||||||
$SUDO_CMD python update.py $project_dir)
|
$SUDO_CMD python update.py $project_dir)
|
||||||
fi
|
fi
|
||||||
|
|
||||||
pip_install -e $project_dir
|
setup_develop_no_requirements_update $project_dir
|
||||||
# ensure that further actions can do things like setup.py sdist
|
|
||||||
safe_chown -R $STACK_USER $1/*.egg-info
|
|
||||||
|
|
||||||
# We've just gone and possibly modified the user's source tree in an
|
# We've just gone and possibly modified the user's source tree in an
|
||||||
# automated way, which is considered bad form if it's a development
|
# automated way, which is considered bad form if it's a development
|
||||||
@ -1286,6 +1288,18 @@ function setup_develop() {
|
|||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# ``pip install -e`` the package, which processes the dependencies
|
||||||
|
# using pip before running `setup.py develop`
|
||||||
|
# Uses globals ``STACK_USER``
|
||||||
|
# setup_develop_no_requirements_update directory
|
||||||
|
function setup_develop_no_requirements_update() {
|
||||||
|
local project_dir=$1
|
||||||
|
|
||||||
|
pip_install -e $project_dir
|
||||||
|
# ensure that further actions can do things like setup.py sdist
|
||||||
|
safe_chown -R $STACK_USER $1/*.egg-info
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
# Service wrapper to start services
|
# Service wrapper to start services
|
||||||
# start_service service-name
|
# start_service service-name
|
||||||
|
@ -39,10 +39,10 @@ function install_stackforge() {
|
|||||||
cleanup_stackforge
|
cleanup_stackforge
|
||||||
|
|
||||||
git_clone $WSME_REPO $WSME_DIR $WSME_BRANCH
|
git_clone $WSME_REPO $WSME_DIR $WSME_BRANCH
|
||||||
setup_develop $WSME_DIR
|
setup_develop_no_requirements_update $WSME_DIR
|
||||||
|
|
||||||
git_clone $PECAN_REPO $PECAN_DIR $PECAN_BRANCH
|
git_clone $PECAN_REPO $PECAN_DIR $PECAN_BRANCH
|
||||||
setup_develop $PECAN_DIR
|
setup_develop_no_requirements_update $PECAN_DIR
|
||||||
}
|
}
|
||||||
|
|
||||||
# cleanup_stackforge() - purge possibly old versions of stackforge libraries
|
# cleanup_stackforge() - purge possibly old versions of stackforge libraries
|
||||||
|
Loading…
x
Reference in New Issue
Block a user