openstack
/
keystone
Code Issues Proposed changes

Merge "Default the resource backend to SQL"

This commit is contained in:
Jenkins 2016-10-06 15:31:06 +00:00 committed by Gerrit Code Review
parent a7efed27f5 d7b836e53e
commit 4767e58eff
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
keystone/conf/resource.py
View File

@ -17,11 +17,11 @@ from keystone.conf import utils
driver = cfg.StrOpt(
'driver',
default='sql',
help=utils.fmt("""
Entry point for the resource driver in the `keystone.resource` namespace. Only
a `sql` driver is supplied by keystone. If a resource driver is not specified,
the assignment driver will choose the resource driver to maintain backwards
compatibility with older configuration files.
a `sql` driver is supplied by keystone. Unless you are writing proprietary
drivers for keystone, you do not need to set this option.
"""))
caching = cfg.BoolOpt(

7
keystone/resource/core.py
View File

@ -52,14 +52,7 @@ class Manager(manager.Manager):
_PROJECT = 'project'
def __init__(self):
# If there is a specific driver specified for resource, then use it.
# Otherwise retrieve the driver type from the assignment driver.
resource_driver = CONF.resource.driver
if resource_driver is None:
assignment_manager = dependency.get_provider('assignment_api')
resource_driver = assignment_manager.default_resource_driver()
super(Manager, self).__init__(resource_driver)
def _get_hierarchy_depth(self, parents_list):