From: Bob Kukura <rkukura@redhat.com>
Date: Fri, 4 Oct 2013 20:17:37 +0000 (-0400)
Subject: Change rpc_support_old_agents default to False
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=24ed85ebe4910c61010bf50ab4cd8eaa06960594;p=openstack-build%2Fneutron-build.git

Change rpc_support_old_agents default to False

Changes the rpc_support_old_agents config variable default value to
False, so that the vlan_id field (redundant with the segmentation_id
field) is no longer included in RPC messages from the linuxbridge and
mlnx plugins to their corresponding L2 agents. This can be set to True
if needed to support L2 agents older than midway through the havana
cycle.

Closes-Bug: 1235323
Change-Id: I919824c5b02e28e3563e64e98bb106bf722327ec
(cherry picked from commit f969d47a959ee1aa309cb697ea6a27965278810a)
---

diff --git a/etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini b/etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini
index b8cbd3c0c..7235476f5 100644
--- a/etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini
+++ b/etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini
@@ -65,8 +65,8 @@
 # (BoolOpt) Enable server RPC compatibility with old (pre-havana)
 # agents.
 #
-# rpc_support_old_agents = True
-# Example: rpc_support_old_agents = False
+# rpc_support_old_agents = False
+# Example: rpc_support_old_agents = True
 
 [securitygroup]
 # Firewall driver for realizing neutron security group function
diff --git a/etc/neutron/plugins/mlnx/mlnx_conf.ini b/etc/neutron/plugins/mlnx/mlnx_conf.ini
index 697191d88..c3e5cc88e 100644
--- a/etc/neutron/plugins/mlnx/mlnx_conf.ini
+++ b/etc/neutron/plugins/mlnx/mlnx_conf.ini
@@ -48,4 +48,4 @@
 # (BoolOpt) Enable server RPC compatibility with old (pre-havana)
 # agents.
 #
-# rpc_support_old_agents = True
+# rpc_support_old_agents = False
diff --git a/neutron/plugins/linuxbridge/common/config.py b/neutron/plugins/linuxbridge/common/config.py
index 5b9002109..8736d63a6 100644
--- a/neutron/plugins/linuxbridge/common/config.py
+++ b/neutron/plugins/linuxbridge/common/config.py
@@ -65,8 +65,7 @@ agent_opts = [
     cfg.IntOpt('polling_interval', default=2,
                help=_("The number of seconds the agent will wait between "
                       "polling for local device changes.")),
-    #TODO(rkukura): Change default to False before havana rc1
-    cfg.BoolOpt('rpc_support_old_agents', default=True,
+    cfg.BoolOpt('rpc_support_old_agents', default=False,
                 help=_("Enable server RPC compatibility with old agents")),
 ]
 
diff --git a/neutron/plugins/mlnx/common/config.py b/neutron/plugins/mlnx/common/config.py
index 837506749..fb374b2f5 100644
--- a/neutron/plugins/mlnx/common/config.py
+++ b/neutron/plugins/mlnx/common/config.py
@@ -54,7 +54,7 @@ agent_opts = [
     cfg.IntOpt('polling_interval', default=2,
                help=_("The number of seconds the agent will wait between "
                       "polling for local device changes.")),
-    cfg.BoolOpt('rpc_support_old_agents', default=True,
+    cfg.BoolOpt('rpc_support_old_agents', default=False,
                 help=_("Enable server RPC compatibility with old agents")),
 ]
 
diff --git a/neutron/tests/unit/linuxbridge/test_defaults.py b/neutron/tests/unit/linuxbridge/test_defaults.py
index b9ff6e0d9..1c395e81d 100644
--- a/neutron/tests/unit/linuxbridge/test_defaults.py
+++ b/neutron/tests/unit/linuxbridge/test_defaults.py
@@ -24,7 +24,7 @@ class ConfigurationTest(base.BaseTestCase):
     def test_defaults(self):
         self.assertEqual(2,
                          cfg.CONF.AGENT.polling_interval)
-        self.assertEqual(True,
+        self.assertEqual(False,
                          cfg.CONF.AGENT.rpc_support_old_agents)
         self.assertEqual('sudo',
                          cfg.CONF.AGENT.root_helper)