openstack/devstack
Code Issues Proposed changes

Merge "Source fixup_stuff..."

Browse Source
This commit is contained in:
Jenkins
2014-08-23 08:25:39 +00:00
committed by Gerrit Code Review
parent dc85b3a772 04a351133a
commit 7e585f6370
2 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
stack.sh
View File

@@ -678,7 +678,7 @@ if [[ "$OFFLINE" != "True" ]]; then
fi
# Do the ugly hacks for broken packages and distros
$TOP_DIR/tools/fixup_stuff.sh
source $TOP_DIR/tools/fixup_stuff.sh
# Extras Pre-install

24
tools/fixup_stuff.sh
View File

@@ -20,20 +20,24 @@
# - pre-install hgtools to work around a bug in RHEL6 distribute
# - install nose 1.1 from EPEL
set -o errexit
set -o xtrace
# If TOP_DIR is set we're being sourced rather than running stand-alone
# or in a sub-shell
if [[ -z "$TOP_DIR" ]]; then
set -o errexit
set -o xtrace
# Keep track of the current directory
TOOLS_DIR=$(cd $(dirname "$0") && pwd)
TOP_DIR=$(cd $TOOLS_DIR/..; pwd)
# Keep track of the current directory
TOOLS_DIR=$(cd $(dirname "$0") && pwd)
TOP_DIR=$(cd $TOOLS_DIR/..; pwd)
# Change dir to top of devstack
cd $TOP_DIR
# Change dir to top of devstack
cd $TOP_DIR
# Import common functions
source $TOP_DIR/functions
# Import common functions
source $TOP_DIR/functions
FILES=$TOP_DIR/files
FILES=$TOP_DIR/files
fi
# Keystone Port Reservation
# -------------------------