Merge "Validate local_ip for OVS agent is actual ip address"

This commit is contained in:
Jenkins 2014-11-21 02:26:51 +00:00 committed by Gerrit Code Review
commit 1aaa85c8c4

View File

@ -37,8 +37,8 @@ ovs_opts = [
cfg.StrOpt('tun_peer_patch_port', default='patch-int', cfg.StrOpt('tun_peer_patch_port', default='patch-int',
help=_("Peer patch port in tunnel bridge for integration " help=_("Peer patch port in tunnel bridge for integration "
"bridge.")), "bridge.")),
cfg.StrOpt('local_ip', default='', cfg.IPOpt('local_ip', version=4,
help=_("Local IP address of GRE tunnel endpoints.")), help=_("Local IP address of tunnel endpoint.")),
cfg.ListOpt('bridge_mappings', cfg.ListOpt('bridge_mappings',
default=DEFAULT_BRIDGE_MAPPINGS, default=DEFAULT_BRIDGE_MAPPINGS,
help=_("List of <physical_network>:<bridge>. " help=_("List of <physical_network>:<bridge>. "