From: Jenkins <jenkins@review.openstack.org>
Date: Thu, 13 Feb 2014 14:55:26 +0000 (+0000)
Subject: Merge "Remove unused code"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=081c5490a84095666a8c5305fffd6396ea434ddd;p=openstack-build%2Fneutron-build.git

Merge "Remove unused code"
---

081c5490a84095666a8c5305fffd6396ea434ddd
diff --cc neutron/agent/l3_agent.py
index 4475ed6c3,64ddf06f6..9931b3666
--- a/neutron/agent/l3_agent.py
+++ b/neutron/agent/l3_agent.py
@@@ -428,18 -428,13 +428,17 @@@ class L3NATAgent(firewall_l3_agent.FWaa
          ri.perform_snat_action(self._handle_router_snat_rules,
                                 internal_cidrs, interface_name)
  
 -        # Process DNAT rules for floating IPs
 +        # Process SNAT/DNAT rules for floating IPs
          if ex_gw_port:
 -            self.process_router_floating_ips(ri, ex_gw_port)
 +            self.process_router_floating_ip_nat_rules(ri)
  
          ri.ex_gw_port = ex_gw_port
-         ri.enable_snat = ri.router.get('enable_snat')
          self.routes_updated(ri)
          ri.iptables_manager.defer_apply_off()
 +        # Once NAT rules for floating IPs are safely in place
 +        # configure their addresses on the external gateway port
 +        if ex_gw_port:
 +            self.process_router_floating_ip_addresses(ri, ex_gw_port)
  
      def _handle_router_snat_rules(self, ri, ex_gw_port, internal_cidrs,
                                    interface_name, action):