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

diff --cc neutron/services/firewall/agents/varmour/varmour_router.py
index 2ae42f5498697f75b7d8049793b4f702c796c61b,c3faa83ba0995d80c954b872256dc3a76b5ca2fc..886c981ff0cf299a7a82803bf22a5ab7425f9515
--- 1/neutron/services/firewall/agents/varmour/varmour_router.py
--- 2/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)
  

diff --cc neutron/services/firewall/fwaas_plugin.py
Simple merge