Skip to content

Commit 05530ca

Browse files
author
Dean Troyer
committed
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
1 parent 3256b8d commit 05530ca

File tree

3 files changed

+13
-0
lines changed

3 files changed

+13
-0
lines changed

exercise.sh

+3
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
# Keep track of the current devstack directory.
66
TOP_DIR=$(cd $(dirname "$0") && pwd)
77

8+
# Import common functions
9+
source $TOP_DIR/functions
10+
811
# Load local configuration
912
source $TOP_DIR/stackrc
1013

samples/local.sh

+3
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@
1313
# Keep track of the devstack directory
1414
TOP_DIR=$(cd $(dirname "$0") && pwd)
1515

16+
# Import common functions
17+
source $TOP_DIR/functions
18+
1619
# Use openrc + stackrc + localrc for settings
1720
source $TOP_DIR/stackrc
1821

tools/build_bm.sh

+7
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,13 @@
55
# Build an OpenStack install on a bare metal machine.
66
set +x
77

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+
815
# Source params
916
source ./stackrc
1017

0 commit comments

Comments
 (0)