From: Li Ma <skywalker.nick@gmail.com>
Date: Wed, 30 Jul 2014 02:09:53 +0000 (-0700)
Subject: Validate local_ip for Linuxbridge agent
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=9fc45cee5af611c888655c0c975b1ac5dde89200;p=openstack-build%2Fneutron-build.git

Validate local_ip for Linuxbridge agent

As oslo.config has introduced Opts for IPv4/6 address,
the local_ip of linuxbridge agent needs to be verified.

Change-Id: I806eaae38c04e30dd81c8a5f711c196946b04316
---

diff --git a/neutron/plugins/linuxbridge/common/config.py b/neutron/plugins/linuxbridge/common/config.py
index a8060a9eb..74942a17f 100644
--- a/neutron/plugins/linuxbridge/common/config.py
+++ b/neutron/plugins/linuxbridge/common/config.py
@@ -42,8 +42,8 @@ vxlan_opts = [
                help=_("TOS for vxlan interface protocol packets.")),
     cfg.StrOpt('vxlan_group', default=DEFAULT_VXLAN_GROUP,
                help=_("Multicast group for vxlan interface.")),
-    cfg.StrOpt('local_ip', default='',
-               help=_("Local IP address of the VXLAN endpoints.")),
+    cfg.IPOpt('local_ip', version=4,
+              help=_("Local IP address of the VXLAN endpoints.")),
     cfg.BoolOpt('l2_population', default=False,
                 help=_("Extension to use alongside ml2 plugin's l2population "
                        "mechanism driver. It enables the plugin to populate "