openstack
/
grenade
Code Issues Proposed changes

Source target functions before calling build_wheels 

Otherwise we get the error:
  build_wheels.sh: line 61: pip_install: command not found

Since the grenade functions do not have pip_install

Change-Id: I8b0ad682203f77f68a03b9b7f56624df6d15ac50
This commit is contained in:
Joe Gordon 2015-05-12 20:15:43 -07:00
parent 2e5cbdd409
commit 2f0fd969ff
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
prep-target
View File

@ -29,10 +29,14 @@ if [[ -d $BASE_RELEASE_DIR/images ]]; then
rsync -a $BASE_RELEASE_DIR/images $TARGET_DEVSTACK_DIR/files
fi
# Get target config
source $TARGET_DEVSTACK_DIR/functions
source $TARGET_DEVSTACK_DIR/stackrc
# Build a wheel cache
source $TARGET_DEVSTACK_DIR/stackrc
if [[ -n ${WHEELHOUSE:-} && ! -d ${WHEELHOUSE:-} ]]; then
WHEELHOUSE=$WHEELHOUSE $TARGET_DEVSTACK_DIR/tools/build_wheels.sh
WHEELHOUSE=$WHEELHOUSE source $TARGET_DEVSTACK_DIR/tools/build_wheels.sh
fi
# Find additional Python packages for venvs
@ -41,10 +45,6 @@ install_database_python
# Set up Screen
# =============
# Get target config
source $TARGET_DEVSTACK_DIR/functions
source $TARGET_DEVSTACK_DIR/stackrc
# Set a reasonable screen statusbar
SCREEN_HARDSTATUS=${SCREEN_HARDSTATUS:-'%{= .} %-Lw%{= .}%> %n%f %t*%{= .}%+Lw%< %-=%{g}(%{d}%H/%l%{g})'}
screen -r $SCREEN_NAME -X hardstatus alwayslastline "$SCREEN_HARDSTATUS"