From 02a69b7d25eb15d31a069fb4c7b104da02e93c13 Mon Sep 17 00:00:00 2001
From: Davanum Srinivas <davanum@gmail.com>
Date: Thu, 19 Mar 2015 14:04:42 -0400
Subject: [PATCH] Sync from oslo-incubator

Here are the changes:
f29e865 Store ProcessLauncher signal handlers on class level
5509577 Remove unused validate_ssl_version

Also removed policy.py from openstack-common.conf as it is
already removed from oslo-incubator.

Change-Id: Id1d7250b5cff142d54004f604e6c2ae04709958b
---
 nova/openstack/common/service.py  | 10 +++++++++-
 nova/openstack/common/sslutils.py | 24 ------------------------
 openstack-common.conf             |  1 -
 3 files changed, 9 insertions(+), 26 deletions(-)

diff --git a/nova/openstack/common/service.py b/nova/openstack/common/service.py
index 6cfb54113cd9..a8552e8bcc45 100644
--- a/nova/openstack/common/service.py
+++ b/nova/openstack/common/service.py
@@ -199,6 +199,13 @@ class ServiceWrapper(object):
 
 
 class ProcessLauncher(object):
+    _signal_handlers_set = set()
+
+    @classmethod
+    def _handle_class_signals(cls, *args, **kwargs):
+        for handler in cls._signal_handlers_set:
+            handler(*args, **kwargs)
+
     def __init__(self):
         """Constructor."""
 
@@ -210,7 +217,8 @@ class ProcessLauncher(object):
         self.handle_signal()
 
     def handle_signal(self):
-        _set_signals_handler(self._handle_signal)
+        self._signal_handlers_set.add(self._handle_signal)
+        _set_signals_handler(self._handle_class_signals)
 
     def _handle_signal(self, signo, frame):
         self.sigcaught = signo
diff --git a/nova/openstack/common/sslutils.py b/nova/openstack/common/sslutils.py
index d7444ec65c0c..86c6f0af94e7 100644
--- a/nova/openstack/common/sslutils.py
+++ b/nova/openstack/common/sslutils.py
@@ -79,27 +79,3 @@ def wrap(sock):
         ssl_kwargs['cert_reqs'] = ssl.CERT_REQUIRED
 
     return ssl.wrap_socket(sock, **ssl_kwargs)
-
-
-_SSL_PROTOCOLS = {
-    "tlsv1": ssl.PROTOCOL_TLSv1,
-    "sslv23": ssl.PROTOCOL_SSLv23,
-}
-
-try:
-    _SSL_PROTOCOLS["sslv2"] = ssl.PROTOCOL_SSLv2
-except AttributeError:
-    pass
-
-try:
-    _SSL_PROTOCOLS["sslv3"] = ssl.PROTOCOL_SSLv3
-except AttributeError:
-    pass
-
-
-def validate_ssl_version(version):
-    key = version.lower()
-    try:
-        return _SSL_PROTOCOLS[key]
-    except KeyError:
-        raise RuntimeError(_("Invalid SSL version : %s") % version)
diff --git a/openstack-common.conf b/openstack-common.conf
index 5896977207d5..5eb437b68313 100644
--- a/openstack-common.conf
+++ b/openstack-common.conf
@@ -9,7 +9,6 @@ module=local
 module=loopingcall
 module=memorycache
 module=periodic_task
-module=policy
 module=report
 module=report.generators
 module=report.models