Source functions before stackrc

Dean Troyer · Dean Troyer · commit 05530caf2cc1 · 2012-08-01T20:03:01.000-05:00
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
diff --git a/exercise.sh b/exercise.sh
@@ -5,6 +5,9 @@
 # Keep track of the current devstack directory.
 TOP_DIR=$(cd $(dirname "$0") && pwd)
 
+# Import common functions
+source $TOP_DIR/functions
+
 # Load local configuration
 source $TOP_DIR/stackrc
 
diff --git a/samples/local.sh b/samples/local.sh
@@ -13,6 +13,9 @@
 # Keep track of the devstack directory
 TOP_DIR=$(cd $(dirname "$0") && pwd)
 
+# Import common functions
+source $TOP_DIR/functions
+
 # Use openrc + stackrc + localrc for settings
 source $TOP_DIR/stackrc
 
diff --git a/tools/build_bm.sh b/tools/build_bm.sh
@@ -5,6 +5,13 @@
 # Build an OpenStack install on a bare metal machine.
 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 ./stackrc
 
