From: Gary Kotton <gkotton@vmware.com>
Date: Sun, 1 Nov 2015 08:46:13 +0000 (-0700)
Subject: PortOpt cleanups
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=988048bf8ff954fcf0c8025c41423990f5a021b1;p=openstack-build%2Fneutron-build.git

PortOpt cleanups

Commit 44d73d1ad3073958c8d5cce933deedc7e6ea5f83 added support
for oslo.config 2.6.

Commit 4d2cb851b7b7d6399163ca9f624f656a3e41ac34 added this to Neutron.

The patch adds a few missing items.

Change-Id: Id36515e28458c354ddb6fe3656f182d17df08f8a
---

diff --git a/etc/neutron/plugins/ml2/openvswitch_agent.ini b/etc/neutron/plugins/ml2/openvswitch_agent.ini
index ad096871f..28c4d2c2e 100644
--- a/etc/neutron/plugins/ml2/openvswitch_agent.ini
+++ b/etc/neutron/plugins/ml2/openvswitch_agent.ini
@@ -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.
 #
diff --git a/neutron/plugins/ml2/drivers/openvswitch/agent/common/config.py b/neutron/plugins/ml2/drivers/openvswitch/agent/common/config.py
index edc51326b..2d732334d 100644
--- a/neutron/plugins/ml2/drivers/openvswitch/agent/common/config.py
+++ b/neutron/plugins/ml2/drivers/openvswitch/agent/common/config.py
@@ -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. "