Merge "Ensure that update_fip_statuses gets called"

diff --cc neutron/agent/l3/router_info.py
index ce5b5a684d8f5c752f3d9b69945168cedbfbfddd,830479452484098f2239708797c383f0242a6a96..8b25f0a6a33761d97f2921109db74a17f9c72875
--- 1/neutron/agent/l3/router_info.py
--- 2/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():