From 443f8df042477828de9cf9845a066221fb8486fb Mon Sep 17 00:00:00 2001 From: "Sean M. Collins" Date: Fri, 18 Dec 2015 11:07:58 -0500 Subject: [PATCH] Linux Bridge Neutron job - remove vlan options They do not appear to be honored anyway - Linux Bridge by default uses vxlan and this config stanza did not explicitly disable vxlan. So let's just use vxlan and delete the vlan cruft that is unused. Change-Id: I32a09202b429a577bf1e394d36a12e5d335cd653 --- jenkins/jobs/neutron.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkins/jobs/neutron.yaml b/jenkins/jobs/neutron.yaml index 19d9605063..a0902856c8 100644 --- a/jenkins/jobs/neutron.yaml +++ b/jenkins/jobs/neutron.yaml @@ -408,7 +408,7 @@ export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_TEMPEST_FULL=1 export DEVSTACK_GATE_NEUTRON=1 - export DEVSTACK_LOCAL_CONFIG="Q_AGENT=linuxbridge"$'\n'"ENABLE_TENANT_VLANS=True"$'\n'"PHYSICAL_NETWORK=default"$'\n'"TENANT_VLAN_RANGE=100:200"$'\n'"LB_PHYSICAL_INTERFACE=eth0"$'\n' + export DEVSTACK_LOCAL_CONFIG="Q_AGENT=linuxbridge"$'\n'"PHYSICAL_NETWORK=default"$'\n'"LB_PHYSICAL_INTERFACE=eth0"$'\n' export BRANCH_OVERRIDE={branch-override} if [ "$BRANCH_OVERRIDE" != "default" ] ; then export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE