Merge "Trivial: Cleanup unused conf variables"

keystone/assignment/backends/sql.py

@@ -12,17 +12,12 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from oslo_config import cfg
-
 from keystone import assignment as keystone_assignment
 from keystone.common import sql
 from keystone import exception
 from keystone.i18n import _
 
 
-CONF = cfg.CONF
-
-
 class AssignmentType(object):
     USER_PROJECT = 'UserProject'
     GROUP_PROJECT = 'GroupProject'

keystone/common/sql/migrate_repo/versions/067_kilo.py

@@ -12,7 +12,6 @@
 
 
 import migrate
-from oslo_config import cfg
 from oslo_log import log
 import sqlalchemy as sql
 from sqlalchemy import orm
@@ -24,7 +23,6 @@ from keystone.identity.mapping_backends import mapping as mapping_backend
 
 
 LOG = log.getLogger(__name__)
-CONF = cfg.CONF
 
 
 def upgrade(migrate_engine):

keystone/identity/backends/sql.py

@@ -12,8 +12,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from oslo_config import cfg
-
 from keystone.common import driver_hints
 from keystone.common import sql
 from keystone.common import utils
@@ -22,9 +20,6 @@ from keystone.i18n import _
 from keystone import identity
 
 
-CONF = cfg.CONF
-
-
 class User(sql.ModelBase, sql.DictBase):
     __tablename__ = 'user'
     attributes = ['id', 'name', 'domain_id', 'password', 'enabled',

keystone/resource/V8_backends/sql.py

@@ -10,7 +10,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from oslo_config import cfg
 from oslo_log import log
 
 from keystone.common import clean
@@ -21,7 +20,6 @@ from keystone.i18n import _LE
 from keystone import resource as keystone_resource
 
 
-CONF = cfg.CONF
 LOG = log.getLogger(__name__)
 
 

keystone/resource/backends/sql.py

@@ -10,7 +10,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from oslo_config import cfg
 from oslo_log import log
 
 from keystone.common import clean
@@ -21,7 +20,6 @@ from keystone.i18n import _LE, _LW
 from keystone import resource as keystone_resource
 
 
-CONF = cfg.CONF
 LOG = log.getLogger(__name__)
 
 

keystone/tests/unit/catalog/test_core.py

@@ -12,16 +12,11 @@
 
 import uuid
 
-from oslo_config import cfg
-
 from keystone.catalog import core
 from keystone import exception
 from keystone.tests import unit
 
 
-CONF = cfg.CONF
-
-
 class FormatUrlTests(unit.BaseTestCase):
 
     def test_successful_formatting(self):

keystone/tests/unit/test_backend_kvs.py

@@ -14,7 +14,6 @@
 import datetime
 import uuid
 
-from oslo_config import cfg
 from oslo_utils import timeutils
 import six
 
@@ -25,9 +24,6 @@ from keystone.tests.unit.ksfixtures import database
 from keystone.tests.unit import test_backend
 
 
-CONF = cfg.CONF
-
-
 class KvsToken(unit.TestCase, test_backend.TokenTests):
     def setUp(self):
         super(KvsToken, self).setUp()

keystone/tests/unit/test_v3_oauth1.py

@@ -16,7 +16,6 @@ import copy
 import uuid
 
 import mock
-from oslo_config import cfg
 from oslo_log import versionutils
 from oslo_serialization import jsonutils
 from pycadf import cadftaxonomy
@@ -35,9 +34,6 @@ from keystone.tests.unit.ksfixtures import temporaryfile
 from keystone.tests.unit import test_v3
 
 
-CONF = cfg.CONF
-
-
 class OAuth1ContribTests(test_v3.RestfulTestCase):
 
     @mock.patch.object(versionutils, 'report_deprecated_feature')

keystone/tests/unit/test_v3_trust.py

@@ -13,14 +13,11 @@
 import datetime
 import uuid
 
-from oslo_config import cfg
 from six.moves import http_client
 
 from keystone.tests import unit
 from keystone.tests.unit import test_v3
 
-CONF = cfg.CONF
-
 
 class TestTrustOperations(test_v3.RestfulTestCase):
     """Test module for create, read, update and delete operations on trusts.

keystone/trust/controllers.py

@@ -14,7 +14,6 @@
 
 import uuid
 
-from oslo_config import cfg
 from oslo_utils import timeutils
 import six
 
@@ -29,9 +28,6 @@ from keystone import notifications
 from keystone.trust import schema
 
 
-CONF = cfg.CONF
-
-
 def _trustor_trustee_only(trust, user_id):
     if (user_id != trust.get('trustee_user_id') and
             user_id != trust.get('trustor_user_id')):