From 20bb1684353d8908d3bcce17e6d6abce95791c25 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Wed, 8 Jul 2015 12:18:04 +0900 Subject: [PATCH] midonet-v2: Update after recent plugin changes Change-Id: I5ea17720edd6db464b5fe3772551a6e136aefcd1 --- jenkins/jobs/networking-midonet.yaml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/jenkins/jobs/networking-midonet.yaml b/jenkins/jobs/networking-midonet.yaml index 3af3ca2509..b16a08f426 100644 --- a/jenkins/jobs/networking-midonet.yaml +++ b/jenkins/jobs/networking-midonet.yaml @@ -81,9 +81,6 @@ export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE fi - # Enable MidoNet v2 architecture - export USE_CLUSTER=True - # Because we are testing a non standard project, add # our project repository. This makes zuul do the right # reference magic for testing changes. @@ -94,6 +91,11 @@ export DEVSTACK_LOCAL_CONFIG="enable_plugin networking-midonet git://git.openstack.org/openstack/networking-midonet" export DEVSTACK_LOCAL_CONFIG+=$'\n'"Q_PLUGIN=midonet" + # Enable MidoNet v2 architecture + export DEVSTACK_LOCAL_CONFIG+=$'\n'"MIDONET_PLUGIN=midonet.neutron.plugin_v2.MidonetPluginV2" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"MIDONET_CLIENT=midonet.neutron.client.cluster.MidonetClusterClient" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"MIDONET_USE_ZOOM=True" + # Keep localrc to be able to set some vars in pre_test_hook export KEEP_LOCALRC=1