update some names
This commit is contained in:
parent
e2f04f224e
commit
fc79bbe7f4
|
@ -19,7 +19,7 @@ if os.path.exists(os.path.join(possible_topdir,
|
|||
from paste import deploy
|
||||
|
||||
from keystone import config
|
||||
from keystone import wsgi
|
||||
from keystone.common import wsgi
|
||||
|
||||
|
||||
CONF = config.CONF
|
||||
|
|
|
@ -19,7 +19,7 @@ if os.path.exists(os.path.join(possible_topdir,
|
|||
|
||||
|
||||
from keystone import config
|
||||
from keystone import utils
|
||||
from keystone.common import utils
|
||||
|
||||
|
||||
CONF = config.CONF
|
||||
|
|
|
@ -23,23 +23,23 @@ max_pool_size = 10
|
|||
pool_timeout = 200
|
||||
|
||||
[identity]
|
||||
driver = keystone.backends.kvs.KvsIdentity
|
||||
driver = keystone.identity.backends.kvs.Identity
|
||||
|
||||
[catalog]
|
||||
driver = keystone.backends.templated.TemplatedCatalog
|
||||
driver = keystone.catalog.backends.templated.TemplatedCatalog
|
||||
template_file = ./etc/default_catalog.templates
|
||||
|
||||
[token]
|
||||
driver = keystone.backends.kvs.KvsToken
|
||||
driver = keystone.token.backends.kvs.Token
|
||||
|
||||
[policy]
|
||||
driver = keystone.backends.policy.SimpleMatch
|
||||
driver = keystone.policy.backends.simple.SimpleMatch
|
||||
|
||||
[ec2]
|
||||
driver = keystone.backends.kvs.KvsEc2
|
||||
driver = keystone.contrib.ec2.backends.kvs.Ec2
|
||||
|
||||
[filter:debug]
|
||||
paste.filter_factory = keystone.wsgi:Debug.factory
|
||||
paste.filter_factory = keystone.common.wsgi:Debug.factory
|
||||
|
||||
[filter:token_auth]
|
||||
paste.filter_factory = keystone.middleware:TokenAuthMiddleware.factory
|
||||
|
@ -51,10 +51,10 @@ paste.filter_factory = keystone.middleware:AdminTokenAuthMiddleware.factory
|
|||
paste.filter_factory = keystone.middleware:JsonBodyMiddleware.factory
|
||||
|
||||
[filter:crud_extension]
|
||||
paste.filter_factory = keystone.service:AdminCrudExtension.factory
|
||||
paste.filter_factory = keystone.contrib.admin_crud:CrudExtension.factory
|
||||
|
||||
[filter:ec2_extension]
|
||||
paste.filter_factory = keystone.service:Ec2Extension.factory
|
||||
paste.filter_factory = keystone.contrib.ec2:Ec2Extension.factory
|
||||
|
||||
[app:public_service]
|
||||
paste.app_factory = keystone.service:public_app_factory
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
from keystone.common import kvs
|
||||
|
||||
|
||||
class KvsCatalog(kvs.Base):
|
||||
class Catalog(kvs.Base):
|
||||
# Public interface
|
||||
def get_catalog(self, user_id, tenant_id, metadata=None):
|
||||
return self.db.get('catalog-%s-%s' % (tenant_id, user_id))
|
||||
|
|
|
@ -82,7 +82,7 @@ class UserTenantMembership(sql.ModelBase, sql.DictBase):
|
|||
primary_key=True)
|
||||
|
||||
|
||||
class SqlIdentity(sql.Base):
|
||||
class Identity(sql.Base):
|
||||
# Internal interface to manage the database
|
||||
def db_sync(self):
|
||||
migration.db_sync()
|
||||
|
|
|
@ -1 +1 @@
|
|||
from keystone.middleware.internal import *
|
||||
from keystone.middleware.core import *
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
from keystone.common import kvs
|
||||
|
||||
class KvsToken(kvs.Base):
|
||||
class Token(kvs.Base):
|
||||
# Public interface
|
||||
def get_token(self, token_id):
|
||||
return self.db.get('token-%s' % token_id)
|
||||
|
|
Loading…
Reference in New Issue