Remove unused CONF
Change-Id: Ie748beb4236b13508f66b396efbeca4965d3da14
This commit is contained in:
parent
6c6589d2b0
commit
19559b69c0
|
@ -21,11 +21,8 @@ from keystone.assignment import controllers
|
||||||
from keystone.common import json_home
|
from keystone.common import json_home
|
||||||
from keystone.common import router
|
from keystone.common import router
|
||||||
from keystone.common import wsgi
|
from keystone.common import wsgi
|
||||||
import keystone.conf
|
|
||||||
|
|
||||||
|
|
||||||
CONF = keystone.conf.CONF
|
|
||||||
|
|
||||||
build_os_inherit_relation = functools.partial(
|
build_os_inherit_relation = functools.partial(
|
||||||
json_home.build_v3_extension_resource_relation,
|
json_home.build_v3_extension_resource_relation,
|
||||||
extension_name='OS-INHERIT', extension_version='1.0')
|
extension_name='OS-INHERIT', extension_version='1.0')
|
||||||
|
|
|
@ -24,13 +24,10 @@ import six
|
||||||
import sqlalchemy
|
import sqlalchemy
|
||||||
|
|
||||||
from keystone.common import sql
|
from keystone.common import sql
|
||||||
import keystone.conf
|
|
||||||
from keystone import exception
|
from keystone import exception
|
||||||
from keystone.i18n import _
|
from keystone.i18n import _
|
||||||
|
|
||||||
|
|
||||||
CONF = keystone.conf.CONF
|
|
||||||
|
|
||||||
USE_TRIGGERS = True
|
USE_TRIGGERS = True
|
||||||
|
|
||||||
LEGACY_REPO = 'migrate_repo'
|
LEGACY_REPO = 'migrate_repo'
|
||||||
|
|
|
@ -17,11 +17,9 @@ from oslo_log import versionutils
|
||||||
from oslo_serialization import jsonutils
|
from oslo_serialization import jsonutils
|
||||||
|
|
||||||
from keystone.common import wsgi
|
from keystone.common import wsgi
|
||||||
import keystone.conf
|
|
||||||
from keystone import exception
|
from keystone import exception
|
||||||
|
|
||||||
|
|
||||||
CONF = keystone.conf.CONF
|
|
||||||
LOG = log.getLogger(__name__)
|
LOG = log.getLogger(__name__)
|
||||||
|
|
||||||
# Header used to transmit the auth token
|
# Header used to transmit the auth token
|
||||||
|
|
|
@ -16,12 +16,10 @@ from oslo_utils import reflection
|
||||||
from oslo_utils import timeutils
|
from oslo_utils import timeutils
|
||||||
import six
|
import six
|
||||||
|
|
||||||
import keystone.conf
|
|
||||||
from keystone import exception
|
from keystone import exception
|
||||||
from keystone.federation import constants
|
from keystone.federation import constants
|
||||||
from keystone.i18n import _
|
from keystone.i18n import _
|
||||||
|
|
||||||
CONF = keystone.conf.CONF
|
|
||||||
# supported token versions
|
# supported token versions
|
||||||
V2 = 'v2.0'
|
V2 = 'v2.0'
|
||||||
V3 = 'v3.0'
|
V3 = 'v3.0'
|
||||||
|
|
|
@ -18,12 +18,10 @@
|
||||||
from oslo_log import log
|
from oslo_log import log
|
||||||
|
|
||||||
from keystone.common import policy
|
from keystone.common import policy
|
||||||
import keystone.conf
|
|
||||||
from keystone import exception
|
from keystone import exception
|
||||||
from keystone.policy.backends import base
|
from keystone.policy.backends import base
|
||||||
|
|
||||||
|
|
||||||
CONF = keystone.conf.CONF
|
|
||||||
LOG = log.getLogger(__name__)
|
LOG = log.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -16,13 +16,9 @@ import abc
|
||||||
|
|
||||||
import six
|
import six
|
||||||
|
|
||||||
import keystone.conf
|
|
||||||
from keystone import exception
|
from keystone import exception
|
||||||
|
|
||||||
|
|
||||||
CONF = keystone.conf.CONF
|
|
||||||
|
|
||||||
|
|
||||||
@six.add_metaclass(abc.ABCMeta)
|
@six.add_metaclass(abc.ABCMeta)
|
||||||
class DomainConfigDriverBase(object):
|
class DomainConfigDriverBase(object):
|
||||||
"""Interface description for a Domain Config driver."""
|
"""Interface description for a Domain Config driver."""
|
||||||
|
|
|
@ -14,7 +14,6 @@ import uuid
|
||||||
|
|
||||||
from six.moves import range
|
from six.moves import range
|
||||||
|
|
||||||
import keystone.conf
|
|
||||||
from keystone.credential.providers import fernet as credential_provider
|
from keystone.credential.providers import fernet as credential_provider
|
||||||
from keystone.tests import unit
|
from keystone.tests import unit
|
||||||
from keystone.tests.unit import default_fixtures
|
from keystone.tests.unit import default_fixtures
|
||||||
|
@ -22,9 +21,6 @@ from keystone.tests.unit import ksfixtures
|
||||||
from keystone.tests.unit.ksfixtures import database
|
from keystone.tests.unit.ksfixtures import database
|
||||||
|
|
||||||
|
|
||||||
CONF = keystone.conf.CONF
|
|
||||||
|
|
||||||
|
|
||||||
class SqlTests(unit.SQLDriverOverrides, unit.TestCase):
|
class SqlTests(unit.SQLDriverOverrides, unit.TestCase):
|
||||||
|
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
|
|
|
@ -17,14 +17,11 @@ import uuid
|
||||||
from oslo_log import log
|
from oslo_log import log
|
||||||
|
|
||||||
from keystone.common import fernet_utils
|
from keystone.common import fernet_utils
|
||||||
import keystone.conf
|
|
||||||
from keystone.credential.providers import fernet as credential_fernet
|
from keystone.credential.providers import fernet as credential_fernet
|
||||||
from keystone.tests import unit
|
from keystone.tests import unit
|
||||||
from keystone.tests.unit import ksfixtures
|
from keystone.tests.unit import ksfixtures
|
||||||
from keystone.tests.unit.ksfixtures import database
|
from keystone.tests.unit.ksfixtures import database
|
||||||
|
|
||||||
CONF = keystone.conf.CONF
|
|
||||||
|
|
||||||
|
|
||||||
class TestFernetCredentialProvider(unit.TestCase):
|
class TestFernetCredentialProvider(unit.TestCase):
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
|
|
|
@ -13,9 +13,6 @@
|
||||||
import fixtures
|
import fixtures
|
||||||
|
|
||||||
from keystone.common import fernet_utils as utils
|
from keystone.common import fernet_utils as utils
|
||||||
import keystone.conf
|
|
||||||
|
|
||||||
CONF = keystone.conf.CONF
|
|
||||||
|
|
||||||
|
|
||||||
class KeyRepository(fixtures.Fixture):
|
class KeyRepository(fixtures.Fixture):
|
||||||
|
|
|
@ -57,7 +57,6 @@ from testtools import matchers
|
||||||
from keystone.cmd import cli
|
from keystone.cmd import cli
|
||||||
from keystone.common import sql
|
from keystone.common import sql
|
||||||
from keystone.common.sql import upgrades
|
from keystone.common.sql import upgrades
|
||||||
import keystone.conf
|
|
||||||
from keystone.credential.providers import fernet as credential_fernet
|
from keystone.credential.providers import fernet as credential_fernet
|
||||||
from keystone.resource.backends import base as resource_base
|
from keystone.resource.backends import base as resource_base
|
||||||
from keystone.tests import unit
|
from keystone.tests import unit
|
||||||
|
@ -66,8 +65,6 @@ from keystone.tests.unit import ksfixtures
|
||||||
from keystone.tests.unit.ksfixtures import database
|
from keystone.tests.unit.ksfixtures import database
|
||||||
|
|
||||||
|
|
||||||
CONF = keystone.conf.CONF
|
|
||||||
|
|
||||||
# NOTE(morganfainberg): This should be updated when each DB migration collapse
|
# NOTE(morganfainberg): This should be updated when each DB migration collapse
|
||||||
# is done to mirror the expected structure of the DB in the format of
|
# is done to mirror the expected structure of the DB in the format of
|
||||||
# { <DB_TABLE_NAME>: [<COLUMN>, <COLUMN>, ...], ... }
|
# { <DB_TABLE_NAME>: [<COLUMN>, <COLUMN>, ...], ... }
|
||||||
|
|
|
@ -21,7 +21,6 @@ from six.moves import http_client
|
||||||
from testtools import matchers
|
from testtools import matchers
|
||||||
|
|
||||||
from keystone.common import utils
|
from keystone.common import utils
|
||||||
import keystone.conf
|
|
||||||
from keystone.contrib.ec2 import controllers
|
from keystone.contrib.ec2 import controllers
|
||||||
from keystone.credential.providers import fernet as credential_fernet
|
from keystone.credential.providers import fernet as credential_fernet
|
||||||
from keystone import exception
|
from keystone import exception
|
||||||
|
@ -30,7 +29,6 @@ from keystone.tests.unit import ksfixtures
|
||||||
from keystone.tests.unit import test_v3
|
from keystone.tests.unit import test_v3
|
||||||
|
|
||||||
|
|
||||||
CONF = keystone.conf.CONF
|
|
||||||
CRED_TYPE_EC2 = controllers.CRED_TYPE_EC2
|
CRED_TYPE_EC2 = controllers.CRED_TYPE_EC2
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -24,14 +24,11 @@ from testtools import matchers as tt_matchers
|
||||||
import webob
|
import webob
|
||||||
|
|
||||||
from keystone.common import json_home
|
from keystone.common import json_home
|
||||||
import keystone.conf
|
|
||||||
from keystone.tests import unit
|
from keystone.tests import unit
|
||||||
from keystone.tests.unit import utils
|
from keystone.tests.unit import utils
|
||||||
from keystone.version import controllers
|
from keystone.version import controllers
|
||||||
|
|
||||||
|
|
||||||
CONF = keystone.conf.CONF
|
|
||||||
|
|
||||||
v2_MEDIA_TYPES = [
|
v2_MEDIA_TYPES = [
|
||||||
{
|
{
|
||||||
"base": "application/json",
|
"base": "application/json",
|
||||||
|
|
Loading…
Reference in New Issue