gate_hook: Stop writing local.conf directly
Adapt to the recent gate changes. [1]
[1] http://lists.openstack.org/pipermail/openstack-dev/2017-February/112872.html
Closes-Bug: #1667331
Change-Id: I9caf5a72545c19dad301e05eb2dcb2fcda1606b7
(cherry picked from commit b1e356e5af
)
This commit is contained in:
parent
05d1ddfeb2
commit
6f49b04224
|
@ -3,7 +3,16 @@
|
|||
set -ex
|
||||
|
||||
GATE_DEST=$BASE/new
|
||||
DEVSTACK_PATH=$GATE_DEST/devstack
|
||||
|
||||
_DEVSTACK_LOCAL_CONFIG_TAIL=
|
||||
|
||||
# Inject config from hook
|
||||
function load_conf_hook {
|
||||
local hook="$1"
|
||||
local GATE_HOOKS=$GATE_DEST/neutron-lbaas/neutron_lbaas/tests/contrib/hooks
|
||||
|
||||
_DEVSTACK_LOCAL_CONFIG_TAIL+=$'\n'"$(cat $GATE_HOOKS/$hook)"
|
||||
}
|
||||
|
||||
export DEVSTACK_LOCAL_CONFIG+="
|
||||
enable_plugin neutron-lbaas https://git.openstack.org/openstack/neutron-lbaas
|
||||
|
@ -26,28 +35,11 @@ function _setup_octavia {
|
|||
ENABLED_SERVICES+="octavia,o-cw,o-hk,o-hm,o-api,"
|
||||
fi
|
||||
if [ "$testenv" = "apiv2" ]; then
|
||||
cat > "$DEVSTACK_PATH/local.conf" <<EOF
|
||||
[[post-config|/etc/octavia/octavia.conf]]
|
||||
[DEFAULT]
|
||||
debug = True
|
||||
|
||||
[controller_worker]
|
||||
amphora_driver = amphora_noop_driver
|
||||
compute_driver = compute_noop_driver
|
||||
network_driver = network_noop_driver
|
||||
|
||||
EOF
|
||||
|
||||
load_conf_hook apiv2
|
||||
fi
|
||||
|
||||
if [ "$testenv" = "scenario" ]; then
|
||||
cat > "$DEVSTACK_PATH/local.conf" <<EOF
|
||||
[[post-config|/etc/octavia/octavia.conf]]
|
||||
[DEFAULT]
|
||||
debug = True
|
||||
|
||||
EOF
|
||||
|
||||
load_conf_hook scenario
|
||||
fi
|
||||
}
|
||||
|
||||
|
@ -57,7 +49,6 @@ case "$testtype" in
|
|||
"dsvm-functional")
|
||||
PROJECT_NAME=neutron-lbaas
|
||||
NEUTRON_LBAAS_PATH=$GATE_DEST/$PROJECT_NAME
|
||||
DEVSTACK_PATH=$GATE_DEST/devstack
|
||||
IS_GATE=True
|
||||
USE_CONSTRAINT_ENV=False
|
||||
export LOG_COLOR=False
|
||||
|
@ -104,6 +95,7 @@ case "$testtype" in
|
|||
fi
|
||||
|
||||
export ENABLED_SERVICES
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"$_DEVSTACK_LOCAL_CONFIG_TAIL"
|
||||
"$GATE_DEST"/devstack-gate/devstack-vm-gate.sh
|
||||
;;
|
||||
|
||||
|
|
|
@ -0,0 +1,8 @@
|
|||
[[post-config|/etc/octavia/octavia.conf]]
|
||||
[DEFAULT]
|
||||
debug = True
|
||||
|
||||
[controller_worker]
|
||||
amphora_driver = amphora_noop_driver
|
||||
compute_driver = compute_noop_driver
|
||||
network_driver = network_noop_driver
|
|
@ -0,0 +1,3 @@
|
|||
[[post-config|/etc/octavia/octavia.conf]]
|
||||
[DEFAULT]
|
||||
debug = True
|
Loading…
Reference in New Issue