From d7b836e53eb048093061e4323e390d025c69521f Mon Sep 17 00:00:00 2001 From: Lance Bragstad Date: Wed, 5 Oct 2016 14:19:54 +0000 Subject: [PATCH] Default the resource backend to SQL Previously, keystone had logic to default the resource backend, without providing a default through configuration. This behavior was removed and we should provide a sensible default for the resource backend. This commit defaults the resource backend to `sql` since that is the only backend keystone currently supports. We also leave a warning saying there isn't any reason to change the default unless a deployer is writing a proprietary or custom resource backend. Change-Id: Ic193eab397a0f10cdf86dec1816aec9da86f1ab8 Partial-Bug: 1630435 --- keystone/conf/resource.py | 6 +++--- keystone/resource/core.py | 7 ------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/keystone/conf/resource.py b/keystone/conf/resource.py index 8945d2e570..afed1c3b5a 100644 --- a/keystone/conf/resource.py +++ b/keystone/conf/resource.py @@ -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( diff --git a/keystone/resource/core.py b/keystone/resource/core.py index abd4e89cc7..adf2b8bbfd 100644 --- a/keystone/resource/core.py +++ b/keystone/resource/core.py @@ -53,14 +53,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) # Make sure it is a driver version we support, and if it is a legacy