Merge "Ensure ovsdb-client is stopped when OVS agent dies"

diff --cc neutron/plugins/openvswitch/agent/ovs_neutron_agent.py
index ec9f5be132558e41fb9a4e916f97464b85c322b5,2f5934a6aaeaf1515f75ecc6b75c7e5390582541..d1fe5f96a8c3e16b496b213c1fe36a478c7d8b9f
--- 1/neutron/plugins/openvswitch/agent/ovs_neutron_agent.py
--- 2/neutron/plugins/openvswitch/agent/ovs_neutron_agent.py
+++ b/neutron/plugins/openvswitch/agent/ovs_neutron_agent.py
@@@ -13,8 -14,16 +13,9 @@@
  #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
  #    License for the specific language governing permissions and limitations
  #    under the License.
 -# @author: Somik Behera, Nicira Networks, Inc.
 -# @author: Brad Hall, Nicira Networks, Inc.
 -# @author: Dan Wendlandt, Nicira Networks, Inc.
 -# @author: Dave Lapsley, Nicira Networks, Inc.
 -# @author: Aaron Rosen, Nicira Networks, Inc.
 -# @author: Seetharama Ayyadevara, Freescale Semiconductor, Inc.
 -# @author: Kyle Mestery, Cisco Systems, Inc.
  
  import distutils.version as dist_version
+ import signal
  import sys
  import time