Merge "Specify network UUID for network create with cells"
diff --git a/functions-common b/functions-common
index f442211..f8543c1 100644
--- a/functions-common
+++ b/functions-common
@@ -1256,8 +1256,13 @@
# sleep to allow bash to be ready to be send the command - we are
# creating a new window in screen and then sends characters, so if
- # bash isn't running by the time we send the command, nothing happens
- sleep 3
+ # bash isn't running by the time we send the command, nothing
+ # happens. This sleep was added originally to handle gate runs
+ # where we needed this to be at least 3 seconds to pass
+ # consistently on slow clouds. Now this is configurable so that we
+ # can determine a reasonable value for the local case which should
+ # be much smaller.
+ sleep ${SCREEN_SLEEP:-3}
NL=`echo -ne '\015'`
# This fun command does the following:
diff --git a/inc/python b/inc/python
index c7cbb52..3d329b5 100644
--- a/inc/python
+++ b/inc/python
@@ -137,7 +137,7 @@
# get_from_global_requirements <package>
function get_from_global_requirements {
local package=$1
- local required_pkg=$(grep -h ^${package} $REQUIREMENTS_DIR/global-requirements.txt | cut -d\# -f1)
+ local required_pkg=$(grep -i -h ^${package} $REQUIREMENTS_DIR/global-requirements.txt | cut -d\# -f1)
if [[ $required_pkg == "" ]]; then
die $LINENO "Can't find package $package in requirements"
fi
diff --git a/stack.sh b/stack.sh
index c795dfc..5cdcbdf 100755
--- a/stack.sh
+++ b/stack.sh
@@ -714,6 +714,9 @@
# Extras Pre-install
# ------------------
+# Install required infra support libraries
+install_infra
+
# Phase: pre-install
run_phase stack pre-install
@@ -733,9 +736,6 @@
echo_summary "Installing OpenStack project source"
-# Install required infra support libraries
-install_infra
-
# Install Oslo libraries
install_oslo