From: Jenkins <jenkins@review.openstack.org>
Date: Fri, 23 Jan 2015 20:10:16 +0000 (+0000)
Subject: Merge "If router is HA, get current_cidrs from keepalived object"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=7d577606e52ac881283639c3d0d312037463f666;p=openstack-build%2Fneutron-build.git

Merge "If router is HA, get current_cidrs from keepalived object"
---

7d577606e52ac881283639c3d0d312037463f666
diff --cc neutron/agent/l3/agent.py
index c73481e52,8f3604340..847ab32ad
--- a/neutron/agent/l3/agent.py
+++ b/neutron/agent/l3/agent.py
@@@ -725,10 -690,9 +731,10 @@@ class L3NATAgent(firewall_l3_agent.FWaa
  
          device = ip_lib.IPDevice(interface_name, self.root_helper,
                                   namespace=ri.ns_name)
-         existing_cidrs = set([addr['cidr'] for addr in device.addr.list()])
+         existing_cidrs = self._get_router_cidrs(ri, device)
          new_cidrs = set()
  
 +        floating_ips = self.get_floating_ips(ri)
          # Loop once to ensure that floating ips are configured.
          for fip in floating_ips:
              fip_ip = fip['floating_ip_address']