openstack
/
neutron-lbaas
Code Issues Proposed changes

Fix the neutron-lbaas namespace driver gate 

This patch fixes the neutron-lbaas namespace driver gate:
gate-neutron-lbaasv2-dsvm-api-namespace-nv

Change-Id: Ib22febb9a9be63d8f69b9450211b15ea3b8f5f22
This commit is contained in:
Michael Johnson 2016-03-04 23:47:07 +00:00
parent d3386d3e97
commit 573c06c8f6
3 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
devstack/plugin.sh
View File

@ -7,9 +7,9 @@ function neutron_lbaas_install {
function neutron_agent_lbaas_install_agent_packages {
if is_ubuntu; then
if [[ ${OFFLINE} == false ]]; then
if [[ ${OFFLINE} == False ]]; then
BACKPORT="deb http://archive.ubuntu.com/ubuntu trusty-backports main restricted universe multiverse"
BACKPORT_EXISTS=$(grep ^ /etc/apt/sources.list /etc/apt/sources.list.d/* | grep "${BACKPORT}")
BACKPORT_EXISTS=$(grep ^ /etc/apt/sources.list /etc/apt/sources.list.d/* | grep "${BACKPORT}") || true
if [[ -z "${BACKPORT_EXISTS}" ]]; then
sudo add-apt-repository "${BACKPORT}" -y
fi
@ -128,6 +128,7 @@ if is_service_enabled $LBAAS_ANY; then
if [[ "$1" == "stack" && "$2" == "install" ]]; then
# Perform installation of service source
echo_summary "Installing neutron-lbaas"
neutron_agent_lbaas_install_agent_packages
neutron_lbaas_install
elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then

9
neutron_lbaas/tests/contrib/gate_hook.sh
View File

@ -54,12 +54,9 @@ if [ "$testenv" != "apiv1" ]; then
fi
if [ "$lbaasdriver" = "namespace" ]; then
cat > $DEVSTACK_PATH/local.conf <<EOF
[[post-config|\$NEUTRON_LBAAS_CONF]]
[service_providers]
service_provider=LOADBALANCERV2:Haproxy:neutron_lbaas.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver:default
EOF
export DEVSTACK_LOCAL_CONFIG+="
NEUTRON_LBAAS_SERVICE_PROVIDERV2=LOADBALANCERV2:Haproxy:neutron_lbaas.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver:default
"
fi
fi
export ENABLED_SERVICES

13
neutron_lbaas/tests/contrib/post_test_hook.sh
View File

@ -12,6 +12,7 @@ OCTAVIA_DIR="$BASE/new/octavia"
LBAAS_VERSION=$lbaasversion
LBAAS_TEST=$lbaasenv
LBAAS_DRIVER=$lbaasdriver
if [ "$LBAAS_VERSION" = "lbaasv1" ]; then
testenv="apiv1"
@ -19,9 +20,15 @@ else
testenv="apiv2"
case "$LBAAS_TEST" in
api)
# Temporarily only test a small subset
# Remove this once zuul/layout.yaml is updated
test_subset="load_balancers"
if [ "$LBAAS_DRIVER" = "namespace" ]; then
test_subset="load_balancers "
test_subset+="listeners "
test_subset+="pools "
test_subset+="members "
test_subset+="health_monitor"
else
testenv=${LBAAS_TEST:-"apiv2"}
fi
;;
minimal)
# Temporarily just do the happy path