From: Jenkins <jenkins@review.openstack.org>
Date: Sat, 13 Dec 2014 02:34:52 +0000 (+0000)
Subject: Merge "Refactor process_router method in L3 agent"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=612c1659db9ab3b7a412d00057ee3d5266304625;p=openstack-build%2Fneutron-build.git

Merge "Refactor process_router method in L3 agent"
---

612c1659db9ab3b7a412d00057ee3d5266304625
diff --cc neutron/agent/l3/agent.py
index cbf52e83e,bdd23759d..98a5455c9
--- a/neutron/agent/l3/agent.py
+++ b/neutron/agent/l3/agent.py
@@@ -662,11 -657,9 +657,9 @@@ class L3NATAgent(firewall_l3_agent.FWaa
                                 namespace=ri.ns_name,
                                 prefix=EXTERNAL_DEV_PREFIX)
  
-         # Process static routes for router
-         self.routes_updated(ri)
          # Process SNAT rules for external gateway
          if (not ri.router['distributed'] or
 -            ex_gw_port and ri.router['gw_port_host'] == self.host):
 +            ex_gw_port and self.get_gw_port_host(ri.router) == self.host):
              ri.perform_snat_action(self._handle_router_snat_rules,
                                     interface_name)