The commit 05aa3846a0402edc9cc49f4ba36f09592004b273 into devstack exposed a bug
where pip_install is called before the requirements repository is cloned. This
change ensures that the requirements repository exists before pip_install is
called.
Change-Id: I60b157fc98691764a69cf022852e7a95fc50cdd7
Closes-Bug: #1486304
| ... | ... |
@@ -683,6 +683,11 @@ save_stackenv $LINENO |
| 683 | 683 |
|
| 684 | 684 |
# OpenStack uses a fair number of other projects. |
| 685 | 685 |
|
| 686 |
+# Bring down global requirements before any use of pip_install. This is |
|
| 687 |
+# necessary to ensure that the constraints file is in place before we |
|
| 688 |
+# attempt to apply any constraints to pip installs. |
|
| 689 |
+git_clone $REQUIREMENTS_REPO $REQUIREMENTS_DIR $REQUIREMENTS_BRANCH |
|
| 690 |
+ |
|
| 686 | 691 |
# Install package requirements |
| 687 | 692 |
# Source it so the entire environment is available |
| 688 | 693 |
echo_summary "Installing package prerequisites" |
| ... | ... |
@@ -695,11 +700,6 @@ fi |
| 695 | 695 |
|
| 696 | 696 |
TRACK_DEPENDS=${TRACK_DEPENDS:-False}
|
| 697 | 697 |
|
| 698 |
-# Bring down global requirements before any use of pip_install. This is |
|
| 699 |
-# necessary to ensure that the constraints file is in place before we |
|
| 700 |
-# attempt to apply any constraints to pip installs. |
|
| 701 |
-git_clone $REQUIREMENTS_REPO $REQUIREMENTS_DIR $REQUIREMENTS_BRANCH |
|
| 702 |
- |
|
| 703 | 698 |
# Install Python packages into a virtualenv so that we can track them |
| 704 | 699 |
if [[ $TRACK_DEPENDS = True ]]; then |
| 705 | 700 |
echo_summary "Installing Python packages into a virtualenv $DEST/.venv" |