Browse code
perform install_infra sooner in stack.sh
The install_infra() call needs to be done earlier since
pip_install_gr() depends on it. Also the fact that python module names
are supposed to be lower case but some use camel case is a problem
(for example with XenAPI).
Change-Id: I7012d77134fa0d9c746d87e837934e7dcb337e5c
Closes-Bug: #1441820
Amrith Kumar authored on 2015/04/09 04:37:58Showing 2 changed files
| ... | ... |
@@ -137,7 +137,7 @@ function pip_install {
|
| 137 | 137 |
# get_from_global_requirements <package> |
| 138 | 138 |
function get_from_global_requirements {
|
| 139 | 139 |
local package=$1 |
| 140 |
- local required_pkg=$(grep -h ^${package} $REQUIREMENTS_DIR/global-requirements.txt | cut -d\# -f1)
|
|
| 140 |
+ local required_pkg=$(grep -i -h ^${package} $REQUIREMENTS_DIR/global-requirements.txt | cut -d\# -f1)
|
|
| 141 | 141 |
if [[ $required_pkg == "" ]]; then |
| 142 | 142 |
die $LINENO "Can't find package $package in requirements" |
| 143 | 143 |
fi |
| ... | ... |
@@ -714,6 +714,9 @@ fi |
| 714 | 714 |
# Extras Pre-install |
| 715 | 715 |
# ------------------ |
| 716 | 716 |
|
| 717 |
+# Install required infra support libraries |
|
| 718 |
+install_infra |
|
| 719 |
+ |
|
| 717 | 720 |
# Phase: pre-install |
| 718 | 721 |
run_phase stack pre-install |
| 719 | 722 |
|
| ... | ... |
@@ -733,9 +736,6 @@ fi |
| 733 | 733 |
|
| 734 | 734 |
echo_summary "Installing OpenStack project source" |
| 735 | 735 |
|
| 736 |
-# Install required infra support libraries |
|
| 737 |
-install_infra |
|
| 738 |
- |
|
| 739 | 736 |
# Install Oslo libraries |
| 740 | 737 |
install_oslo |
| 741 | 738 |
|