openstack/devstack
Code Issues Proposed changes

Merge "Actually install the requirements repo."

Browse Source
This commit is contained in:
Jenkins
2015-06-18 03:21:12 +00:00
committed by Gerrit Code Review
parent 98d9651038 f553ce24ea
commit 810dc1d6f4
1 changed files with 4 additions and 3 deletions
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
function install_infra {
# bring down global requirements
git_clone $REQUIREMENTS_REPO $REQUIREMENTS_DIR $REQUIREMENTS_BRANCH
# Install pbr
if use_library_from_git "pbr"; then
git_clone_by_name "pbr"
@@ -41,6 +38,10 @@ function install_infra {
# in via system packages.
pip_install "-U" "pbr"
fi
# bring down global requirements
git_clone $REQUIREMENTS_REPO $REQUIREMENTS_DIR $REQUIREMENTS_BRANCH
pip_install $REQUIREMENTS_DIR
}
# Restore xtrace