From: Jenkins <jenkins@review.openstack.org>
Date: Fri, 21 Nov 2014 13:16:40 +0000 (+0000)
Subject: Merge "Enforce log hints in neutron.services.firewall"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=2ad255ae2bf5990f4689e3994aee99d135c1265a;p=openstack-build%2Fneutron-build.git

Merge "Enforce log hints in neutron.services.firewall"
---

2ad255ae2bf5990f4689e3994aee99d135c1265a
diff --cc neutron/services/firewall/agents/varmour/varmour_router.py
index 2ae42f549,c3faa83ba..886c981ff
--- a/neutron/services/firewall/agents/varmour/varmour_router.py
+++ b/neutron/services/firewall/agents/varmour/varmour_router.py
@@@ -97,8 -98,10 +98,9 @@@ class vArmourL3NATAgent(l3_agent.L3NATA
          ips = port['fixed_ips']
          if not ips:
              raise Exception(_("Router port %s has no IP address") % port['id'])
 -            return
          if len(ips) > 1:
-             LOG.warn(_("Ignoring multiple IPs on router port %s"), port['id'])
+             LOG.warn(_LW("Ignoring multiple IPs on router port %s"),
+                      port['id'])
          prefixlen = netaddr.IPNetwork(port['subnet']['cidr']).prefixlen
          port['ip_cidr'] = "%s/%s" % (ips[0]['ip_address'], prefixlen)