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:
parent
774fd17e4b
commit
24ed85ebe4
|
@ -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
|
||||
|
|
|
@ -48,4 +48,4 @@
|
|||
# (BoolOpt) Enable server RPC compatibility with old (pre-havana)
|
||||
# agents.
|
||||
#
|
||||
# rpc_support_old_agents = True
|
||||
# rpc_support_old_agents = False
|
||||
|
|
|
@ -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")),
|
||||
]
|
||||
|
||||
|
|
|
@ -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")),
|
||||
]
|
||||
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Reference in New Issue