Mark kvs backends as deprecated, for removal in Kilo.

Although kvs.Base was marked from removal in Juno, the backends
themselves were not explicitly marked. This patch does this,
as well as extendes kvs.Base also to Kilo so that they can all
be removed together.

Partially implements: bp deprecated-as-of-juno
Change-Id: Ia2e7c95074c4b6b9743c6086842105a5579fc0c9

keystone/assignment/backends/kvs.py

@@ -18,6 +18,7 @@ from keystone.common import kvs
 from keystone import config
 from keystone import exception
 from keystone.i18n import _
+from keystone.openstack.common import versionutils
 
 
 CONF = config.CONF
@@ -53,6 +54,13 @@ class Assignment(kvs.Base, assignment.Driver):
 
     """
 
+    @versionutils.deprecated(versionutils.deprecated.JUNO,
+                             in_favor_of='keystone.assignment.backends.sql',
+                             remove_in=+1,
+                             what='keystone.assignment.backends.kvs')
+    def __init__(self):
+        super(Assignment, self).__init__()
+
     # Public interface
 
     def get_project(self, tenant_id):

keystone/common/kvs/legacy.py

@@ -48,7 +48,7 @@ INMEMDB = DictKvs()
 class Base(object):
     @versionutils.deprecated(versionutils.deprecated.ICEHOUSE,
                              in_favor_of='keystone.common.kvs.KeyValueStore',
-                             remove_in=+1,
+                             remove_in=+2,
                              what='keystone.common.kvs.Base')
     def __init__(self, db=None):
         if db is None:

keystone/identity/backends/kvs.py

@@ -17,6 +17,7 @@ from keystone.common import utils
 from keystone import exception
 from keystone.i18n import _
 from keystone import identity
+from keystone.openstack.common import versionutils
 
 
 class _UserIdToDomainId(object):
@@ -53,6 +54,11 @@ class _UserIdToDomainId(object):
 
 
 class Identity(kvs.Base, identity.Driver):
+
+    @versionutils.deprecated(versionutils.deprecated.JUNO,
+                             in_favor_of='keystone.identity.backends.sql',
+                             remove_in=+1,
+                             what='keystone.identity.backends.kvs')
     def __init__(self):
         super(Identity, self).__init__()
         self._user_id_to_domain_id = _UserIdToDomainId(self.db)