x/vmware-nsx
Code Issues Proposed changes

Merge "Change rpc_support_old_agents default to False"

Browse Source
This commit is contained in:
Jenkins 2013-10-07 16:21:54 +00:00 committed by Gerrit Code Review
commit eb1540efa1
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) # (BoolOpt) Enable server RPC compatibility with old (pre-havana)
# agents. # agents.
# #
# rpc_support_old_agents = True # rpc_support_old_agents = False
# Example: rpc_support_old_agents = False # Example: rpc_support_old_agents = True
[securitygroup] [securitygroup]
# Firewall driver for realizing neutron security group function # 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) # (BoolOpt) Enable server RPC compatibility with old (pre-havana)
# agents. # 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, cfg.IntOpt('polling_interval', default=2,
help=_("The number of seconds the agent will wait between " help=_("The number of seconds the agent will wait between "
"polling for local device changes.")), "polling for local device changes.")),
#TODO(rkukura): Change default to False before havana rc1 cfg.BoolOpt('rpc_support_old_agents', default=False,
cfg.BoolOpt('rpc_support_old_agents', default=True,
help=_("Enable server RPC compatibility with old agents")), 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, cfg.IntOpt('polling_interval', default=2,
help=_("The number of seconds the agent will wait between " help=_("The number of seconds the agent will wait between "
"polling for local device changes.")), "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")), 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): def test_defaults(self):
self.assertEqual(2, self.assertEqual(2,
cfg.CONF.AGENT.polling_interval) cfg.CONF.AGENT.polling_interval)
self.assertEqual(True, self.assertEqual(False,
cfg.CONF.AGENT.rpc_support_old_agents) cfg.CONF.AGENT.rpc_support_old_agents)
self.assertEqual('sudo', self.assertEqual('sudo',
cfg.CONF.AGENT.root_helper) cfg.CONF.AGENT.root_helper)