openstack
/
neutron-fwaas
Code Issues Proposed changes

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 f969d47a95)
This commit is contained in:
Bob Kukura 2013-10-04 16:17:37 -04:00 committed by Mark McClain
parent 774fd17e4b
commit 24ed85ebe4
5 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini
View File

@ -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

2
etc/neutron/plugins/mlnx/mlnx_conf.ini
View File

@ -48,4 +48,4 @@
# (BoolOpt) Enable server RPC compatibility with old (pre-havana)
# agents.
#
# rpc_support_old_agents = True
# rpc_support_old_agents = False

3
neutron/plugins/linuxbridge/common/config.py
View File

@ -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")),
]

2
neutron/plugins/mlnx/common/config.py
View File

@ -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")),
]

2
neutron/tests/unit/linuxbridge/test_defaults.py
View File

@ -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)