From 04cb27c5804f53cc40c9b7149512ab06788e094a Mon Sep 17 00:00:00 2001 From: Spyros Trigazis Date: Fri, 2 Dec 2016 17:19:08 +0100 Subject: [PATCH] Disable lbaas from ci tests Disable lbaas and octavia since we run only non lbaas tests. Change-Id: Ib7ba661987e609e87b9239cf2c23c29485dc24a5 Partial-Bug: #1646870 --- magnum/tests/contrib/gate_hook.sh | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/magnum/tests/contrib/gate_hook.sh b/magnum/tests/contrib/gate_hook.sh index 5c4bf4638b..d7e0a1c539 100755 --- a/magnum/tests/contrib/gate_hook.sh +++ b/magnum/tests/contrib/gate_hook.sh @@ -22,10 +22,14 @@ export PROJECTS="openstack/barbican $PROJECTS" export DEVSTACK_LOCAL_CONFIG="enable_plugin heat git://git.openstack.org/openstack/heat" export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer" -if [ "${coe}${special}" != "k8s-ironic" ]; then - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron-lbaas https://git.openstack.org/openstack/neutron-lbaas" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin octavia https://github.com/openstack/octavia" -fi +# Disable LBaaS(v1) and LBaaS(v2) +export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service q-lbaas" +export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service q-lbaasv2" +export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service octavia" +export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service o-cw" +export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service o-hk" +export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service o-hm" +export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service o-api" if [ "$coe" = "mesos" ]; then echo "MAGNUM_GUEST_IMAGE_URL=https://fedorapeople.org/groups/magnum/ubuntu-mesos-latest.qcow2" >> $BASE/new/devstack/localrc @@ -43,15 +47,6 @@ elif [ "${coe}${special}" = "k8s-ironic" ]; then export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ironic git://git.openstack.org/openstack/ironic" - # Disable LBaaS(v1) and LBaaS(v2) - export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service q-lbaas" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service q-lbaasv2" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service octavia" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service o-cw" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service o-hk" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service o-hm" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service o-api" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_DEPLOY_DRIVER=pxe_ssh" export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_BAREMETAL_BASIC_OPS=True" export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_LOG_DIR=/opt/stack/new/ironic-bm-logs"