From: Jenkins <jenkins@review.openstack.org>
Date: Thu, 19 Nov 2015 12:21:51 +0000 (+0000)
Subject: Merge "Resync L3, DHCP and OVS/LB agents upon revival"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=c8a7d9bfdba9cab82cc29f563a387d8c3088c630;p=openstack-build%2Fneutron-build.git

Merge "Resync L3, DHCP and OVS/LB agents upon revival"
---

c8a7d9bfdba9cab82cc29f563a387d8c3088c630
diff --cc neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py
index 8212af6a2,5e00c4839..ea51b95af
--- a/neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py
+++ b/neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py
@@@ -1668,8 -1657,11 +1671,12 @@@ class OVSNeutronAgent(sg_rpc.SecurityGr
          tunnel_sync = True
          ovs_restarted = False
          consecutive_resyncs = 0
 +        need_clean_stale_flow = True
          while self._check_and_handle_signal():
+             if self.fullsync:
+                 LOG.info(_LI("rpc_loop doing a full sync."))
+                 sync = True
+                 self.fullsync = False
              port_info = {}
              ancillary_port_info = {}
              start = time.time()