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 b8cbd3c0c12ccdca2b9535a926b0deb47d16adc6..7235476f51fc717cd6ddc1caa6c6d2978fc77445 100644 (file)
--- 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 697191d8879ed69eabb31871e78d04074628abc6..c3e5cc88eac930d7258d03421709cae07aa4e1a5 100644 (file)
--- 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 5b90021098e5f6f910a18965aa428813fbf53674..8736d63a6c023ee3cc302d74df63a9c38c1153ac 100644 (file)
--- 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 8375067492daaa121d0cf6c50580b7fcb1e753e5..fb374b2f5bc697e507384c226208d12f16528dc5 100644 (file)
--- 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 b9ff6e0d9f2e050d1c6606ac5911f9d8980b8b7a..1c395e81d0785fcb41d2e2daa5b42f97a6d910e7 100644 (file)
--- 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)