openstack/devstack
Code Issues Proposed changes

Source functions before stackrc

Browse Source 
The enable_service() and disable_service() functions in
https://review.openstack.org/9407 require the functions
file be sourced before stackrc.

* exercise.sh
* samples/local.sh (this will require manual addition to the user's
  local.sh if they based it on the sample)
* tools/build_bm.sh

Change-Id: I1bed687867e870bef5748289d712376435a776af
This commit is contained in:
Dean Troyer 2012-07-06 15:09:10 -05:00
parent 3256b8d651
commit 05530caf2c
3 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
exercise.sh
View File

@ -5,6 +5,9 @@
# Keep track of the current devstack directory. # Keep track of the current devstack directory.
TOP_DIR=$(cd $(dirname "$0") && pwd) TOP_DIR=$(cd $(dirname "$0") && pwd)
# Import common functions
source $TOP_DIR/functions
# Load local configuration # Load local configuration
source $TOP_DIR/stackrc source $TOP_DIR/stackrc

3
samples/local.sh
View File

@ -13,6 +13,9 @@
# Keep track of the devstack directory # Keep track of the devstack directory
TOP_DIR=$(cd $(dirname "$0") && pwd) TOP_DIR=$(cd $(dirname "$0") && pwd)
# Import common functions
source $TOP_DIR/functions
# Use openrc + stackrc + localrc for settings # Use openrc + stackrc + localrc for settings
source $TOP_DIR/stackrc source $TOP_DIR/stackrc

7
tools/build_bm.sh
View File

@ -5,6 +5,13 @@
# Build an OpenStack install on a bare metal machine. # Build an OpenStack install on a bare metal machine.
set +x set +x
# Keep track of the current directory
TOOLS_DIR=$(cd $(dirname "$0") && pwd)
TOP_DIR=$(cd $TOOLS_DIR/..; pwd)
# Import common functions
source $TOP_DIR/functions
# Source params # Source params
source ./stackrc source ./stackrc