From: Jenkins <jenkins@review.openstack.org>
Date: Thu, 23 Jul 2015 10:10:24 +0000 (+0000)
Subject: Merge "Ensure that update_fip_statuses gets called"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=c2eee235bcc2cd30efda534ec6c7cc229d6077ab;p=openstack-build%2Fneutron-build.git

Merge "Ensure that update_fip_statuses gets called"
---

c2eee235bcc2cd30efda534ec6c7cc229d6077ab
diff --cc neutron/agent/l3/router_info.py
index ce5b5a684,830479452..8b25f0a6a
--- a/neutron/agent/l3/router_info.py
+++ b/neutron/agent/l3/router_info.py
@@@ -579,9 -586,11 +579,10 @@@ class RouterInfo(object)
  
          self._add_snat_rules(ex_gw_port,
                               self.iptables_manager,
 -                             interface_name,
 -                             action)
 +                             interface_name)
  
      def process_external(self, agent):
+         fip_statuses = {}
          existing_floating_ips = self.floating_ips
          try:
              with self.iptables_manager.defer_apply():