Merge "Mark memcache and memcache_pool token deprecated"

This commit is contained in:
Jenkins 2016-01-22 19:10:20 +00:00 committed by Gerrit Code Review
commit 76ecb5ea4b
3 changed files with 19 additions and 0 deletions

@ -14,6 +14,7 @@
# under the License.
from oslo_config import cfg
from oslo_log import versionutils
from keystone.token.persistence.backends import kvs
@ -25,6 +26,11 @@ class Token(kvs.Token):
kvs_backend = 'openstack.kvs.Memcached'
memcached_backend = 'memcached'
@versionutils.deprecated(
what='Memcache Token Persistence Driver',
as_of=versionutils.deprecated.MITAKA,
in_favor_of='fernet token driver (no-persistence)',
remove_in=0)
def __init__(self, *args, **kwargs):
kwargs['memcached_backend'] = self.memcached_backend
kwargs['no_expiry_keys'] = [self.revocation_key]

@ -11,6 +11,7 @@
# under the License.
from oslo_config import cfg
from oslo_log import versionutils
from keystone.token.persistence.backends import memcache
@ -21,6 +22,11 @@ CONF = cfg.CONF
class Token(memcache.Token):
memcached_backend = 'pooled_memcached'
@versionutils.deprecated(
what='Memcache Pool Token Persistence Driver',
as_of=versionutils.deprecated.MITAKA,
in_favor_of='fernet token driver (no-persistence)',
remove_in=0)
def __init__(self, *args, **kwargs):
for arg in ('dead_retry', 'socket_timeout', 'pool_maxsize',
'pool_unused_timeout', 'pool_connection_get_timeout'):

@ -0,0 +1,7 @@
---
deprecations:
- >
[`blueprint deprecated-as-of-mitaka <https://blueprints.launchpad.net/keystone/+spec/deprecated-as-of-mitaka>`_]
The token memcache and memcache_pool persistence
backends have been deprecated in favor of using
Fernet tokens (which require no persistence).