openstack/neutron
Code Issues Proposed changes

Merge "PortOpt cleanups"

Browse Source
This commit is contained in:
Jenkins
2015-11-04 20:00:12 +00:00
committed by Gerrit Code Review
parent 6c29589d2c 988048bf8f
commit 1bba4db6f0
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
etc/neutron/plugins/ml2/openvswitch_agent.ini
View File

@@ -62,7 +62,7 @@
# Used only for 'native' driver.
# of_listen_address = 127.0.0.1
#
# (IntOpt)
# (PortOpt)
# Port to listen on for OpenFlow connections.
# Used only for 'native' driver.
# of_listen_port = 6633
@@ -107,7 +107,7 @@
# Example: tunnel_types = vxlan
# Example: tunnel_types = vxlan, gre
# (IntOpt) The port number to utilize if tunnel_types includes 'vxlan'. By
# (PortOpt) The port number to utilize if tunnel_types includes 'vxlan'. By
# default, this will make use of the Open vSwitch default value of '4789' if
# not specified.
#

2
neutron/plugins/ml2/drivers/openvswitch/agent/common/config.py
View File

@@ -58,7 +58,7 @@ ovs_opts = [
"Used only for 'native' driver.")),
cfg.PortOpt('of_listen_port', default=6633,
help=_("Port to listen on for OpenFlow connections. "
"Used only for 'native' driver.")),
"Used only for 'native' driver.")),
cfg.IntOpt('of_connect_timeout', default=30,
help=_("Timeout in seconds to wait for "
"the local switch connecting the controller. "