openstack/devstack
Code Issues Proposed changes

Actually install the requirements repo.

Browse Source 
The requirements repo has had a setup.cfg etc for a long time but only
recently started using it. As it now has dependencies, we need to pip
install it. To preserve compat with older requirements repos I haven't
changed the call to invoke update-requirements yet, as we still have
the update.py symlink.

The pbr install is moved before requirements to ensure we don't
trigger easy-install.

Change-Id: I7d7e91694c9145fac0ddab8a9de5f789d723c641
This commit is contained in:
Robert Collins 2015-06-17 13:52:20 +12:00
parent 598f2effed
commit f553ce24ea
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/infra
View File

@ -29,9 +29,6 @@ REQUIREMENTS_DIR=$DEST/requirements
# install_infra() - Collect source and prepare # install_infra() - Collect source and prepare
function install_infra { function install_infra {
# bring down global requirements
git_clone $REQUIREMENTS_REPO $REQUIREMENTS_DIR $REQUIREMENTS_BRANCH
# Install pbr # Install pbr
if use_library_from_git "pbr"; then if use_library_from_git "pbr"; then
git_clone_by_name "pbr" git_clone_by_name "pbr"
@ -41,6 +38,10 @@ function install_infra {
# in via system packages. # in via system packages.
pip_install "-U" "pbr" pip_install "-U" "pbr"
fi fi
# bring down global requirements
git_clone $REQUIREMENTS_REPO $REQUIREMENTS_DIR $REQUIREMENTS_BRANCH
pip_install $REQUIREMENTS_DIR
} }
# Restore xtrace # Restore xtrace