From: Jakub Libosvar <libosvar@redhat.com>
Date: Tue, 29 Jul 2014 08:50:12 +0000 (+0200)
Subject: Validate local_ip for OVS agent is actual ip address
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=be6ab2449d8daeabec124c3c601f1aa2d3b5c6ec;p=openstack-build%2Fneutron-build.git

Validate local_ip for OVS agent is actual ip address

tunnel_sync() writes this value into ovsdb and value is not validated. In
case non-ip value is written into ovsdb row must be deleted manually.

Change-Id: I57eee81e6821eb2cb26b3d07a39bc94b81243570
Closes-bug: #1284684
---

diff --git a/neutron/plugins/openvswitch/common/config.py b/neutron/plugins/openvswitch/common/config.py
index d9e045483..2392372ef 100644
--- a/neutron/plugins/openvswitch/common/config.py
+++ b/neutron/plugins/openvswitch/common/config.py
@@ -37,8 +37,8 @@ ovs_opts = [
     cfg.StrOpt('tun_peer_patch_port', default='patch-int',
                help=_("Peer patch port in tunnel bridge for integration "
                       "bridge.")),
-    cfg.StrOpt('local_ip', default='',
-               help=_("Local IP address of GRE tunnel endpoints.")),
+    cfg.IPOpt('local_ip', version=4,
+              help=_("Local IP address of tunnel endpoint.")),
     cfg.ListOpt('bridge_mappings',
                 default=DEFAULT_BRIDGE_MAPPINGS,
                 help=_("List of <physical_network>:<bridge>. "