openstack/devstack
Code Issues Proposed changes

Move platform check after localrc

Browse Source 
This got moved around with some of the recent cleanups I think.  My CI
was putting FORCE=yes into localrc which used to work.  Noticed doing
some bring-up on F21

Change-Id: I7c0ea6b67b42b768278de0fd41d0c0bfbb572387
This commit is contained in:
Ian Wienand 2014-11-05 09:52:27 +11:00
parent e3822cf01d
commit c973e6c96c
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
stack.sh
View File

@ -90,16 +90,6 @@ source $TOP_DIR/lib/config
# and ``DISTRO`` # and ``DISTRO``
GetDistro GetDistro
# Warn users who aren't on an explicitly supported distro, but allow them to
# override check and attempt installation with ``FORCE=yes ./stack``
if [[ ! ${DISTRO} =~ (precise|trusty|7.0|wheezy|sid|testing|jessie|f19|f20|rhel6|rhel7) ]]; then
echo "WARNING: this script has not been tested on $DISTRO"
if [[ "$FORCE" != "yes" ]]; then
die $LINENO "If you wish to run this script anyway run with FORCE=yes"
fi
fi
# Global Settings # Global Settings
# --------------- # ---------------
@ -151,6 +141,15 @@ if [[ ! -r $TOP_DIR/stackrc ]]; then
fi fi
source $TOP_DIR/stackrc source $TOP_DIR/stackrc
# Warn users who aren't on an explicitly supported distro, but allow them to
# override check and attempt installation with ``FORCE=yes ./stack``
if [[ ! ${DISTRO} =~ (precise|trusty|7.0|wheezy|sid|testing|jessie|f19|f20|rhel6|rhel7) ]]; then
echo "WARNING: this script has not been tested on $DISTRO"
if [[ "$FORCE" != "yes" ]]; then
die $LINENO "If you wish to run this script anyway run with FORCE=yes"
fi
fi
# Check to see if we are already running DevStack # Check to see if we are already running DevStack
# Note that this may fail if USE_SCREEN=False # Note that this may fail if USE_SCREEN=False
if type -p screen > /dev/null && screen -ls | egrep -q "[0-9]\.$SCREEN_NAME"; then if type -p screen > /dev/null && screen -ls | egrep -q "[0-9]\.$SCREEN_NAME"; then