1. devstack
  2. Commit 05530caf2cc12716f6b22c103212ba3ea7fe7910
Browse code

Source functions before stackrc

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

Dean Troyer authored on 2012/07/07 05:09:10
Showing 3 changed files
exercise.sh
History View file @ 05530ca
... ... 
@@ -5,6 +5,9 @@
5 5 
 # Keep track of the current devstack directory.
6 6 
 TOP_DIR=$(cd $(dirname "$0") && pwd)
7 7
8 
+# Import common functions
9 
+source $TOP_DIR/functions
10 
+
8 11 
 # Load local configuration
9 12 
 source $TOP_DIR/stackrc
10 13
samples/local.sh
History View file @ 05530ca
... ... 
@@ -13,6 +13,9 @@
13 13 
 # Keep track of the devstack directory
14 14 
 TOP_DIR=$(cd $(dirname "$0") && pwd)
15 15
16 
+# Import common functions
17 
+source $TOP_DIR/functions
18 
+
16 19 
 # Use openrc + stackrc + localrc for settings
17 20 
 source $TOP_DIR/stackrc
18 21
tools/build_bm.sh
History View file @ 05530ca
... ... 
@@ -5,6 +5,13 @@
5 5 
 # Build an OpenStack install on a bare metal machine.
6 6 
 set +x
7 7
8 
+# Keep track of the current directory
9 
+TOOLS_DIR=$(cd $(dirname "$0") && pwd)
10 
+TOP_DIR=$(cd $TOOLS_DIR/..; pwd)
11 
+
12 
+# Import common functions
13 
+source $TOP_DIR/functions
14 
+
8 15 
 # Source params
9 16 
 source ./stackrc
10 17