openstack
/
deb-networking-midonet
Code Issues Proposed changes

devstack: Provide functions earlier for grenade 

Closes-Bug: #1700487
Related-Bug: #1649722
Change-Id: I2353bdcbe5d9b77fd1d5941bc672d5bab53717ef
This commit is contained in:
YAMAMOTO Takashi 2017-07-25 07:04:10 +09:00
parent d0302dabc8
commit b3913d9709
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
devstack/override-defaults
View File

@ -5,3 +5,9 @@ function has_neutron_plugin_security_group {
# 0 means True here
return 0
}
# NOTE(yamamoto): Grenade assumes some of functions are available early.
ABSOLUTE_PATH=$(cd `dirname "${BASH_SOURCE[0]}"` && pwd)
Q_PLUGIN=${Q_PLUGIN:-$NEUTRON_CORE_PLUGIN}
source $ABSOLUTE_PATH/functions
source $ABSOLUTE_PATH/$Q_PLUGIN/functions

3
devstack/plugin.sh
View File

@ -30,9 +30,6 @@ if [[ "$1" == "stack" ]]; then
if [[ "$2" == "pre-install" ]]; then
source $ABSOLUTE_PATH/functions
source $ABSOLUTE_PATH/$Q_PLUGIN/functions
# Install MidoNet packages.
# NOTE(yamamoto): Do this even if MIDONET_USE_PACKAGE=False, to pull
# runtime dependencies like libreswan.