openstack
/
keystone
Code Issues Proposed changes

Merge "remove memcache token persistence backends"

This commit is contained in:
Jenkins 2016-09-22 19:57:44 +00:00 committed by Gerrit Code Review
parent 51cc8bca7f 564c4956f4
commit dc9a1d5f70
3 changed files with 1 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
keystone/tests/unit/test_cli.py
View File

@ -56,7 +56,7 @@ class CliTestCase(unit.SQLDriverOverrides, unit.TestCase):
def test_token_flush_excepts_not_implemented_and_logs_warning(self):
self.useFixture(database.Database())
self.load_backends()
self.config_fixture.config(group='token', driver='memcache')
self.config_fixture.config(group='token', driver='kvs')
log_info = self.useFixture(fixtures.FakeLogger(level=log.WARN))
cli.TokenFlush.main()
self.assertIn("token_flush command had no effect", log_info.output)

39
keystone/token/persistence/backends/memcache.py
View File

@ -1,39 +0,0 @@
# Copyright 2013 Metacloud, Inc.
# Copyright 2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
from oslo_log import versionutils
import keystone.conf
from keystone.token.persistence.backends import kvs
CONF = keystone.conf.CONF
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]
kwargs['memcached_expire_time'] = CONF.token.expiration
kwargs['url'] = CONF.memcache.servers
super(Token, self).__init__(*args, **kwargs)

34
keystone/token/persistence/backends/memcache_pool.py
View File

@ -1,34 +0,0 @@
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
from oslo_log import versionutils
import keystone.conf
from keystone.token.persistence.backends import memcache
CONF = keystone.conf.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'):
kwargs[arg] = getattr(CONF.memcache, arg)
super(Token, self).__init__(*args, **kwargs)