From: Assaf Muller <amuller@redhat.com>
Date: Mon, 19 Oct 2015 22:15:56 +0000 (-0400)
Subject: Remove non-existent enable_tunneling conf from fullstack
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=3b97a9a7ef3cae7bbe220cb77b41bf4f0ef12a85;p=openstack-build%2Fneutron-build.git

Remove non-existent enable_tunneling conf from fullstack

enable_tunneling is not actually a conf option, fullstack
config fixture code was passing it to the OVS agent but
it doesn't do anything.

Change-Id: I4fbe20c37f3ca6395c1ac43123a3cc2338065ed1
---

diff --git a/neutron/tests/fullstack/resources/config.py b/neutron/tests/fullstack/resources/config.py
index cb24b73d0..a1c8450cd 100644
--- a/neutron/tests/fullstack/resources/config.py
+++ b/neutron/tests/fullstack/resources/config.py
@@ -146,7 +146,6 @@ class OVSConfigFixture(ConfigFixture):
         self.tunneling_enabled = self.env_desc.tunneling_enabled
         self.config.update({
             'ovs': {
-                'enable_tunneling': str(self.tunneling_enabled),
                 'local_ip': local_ip,
                 'integration_bridge': self._generate_integration_bridge(),
             },