diff --git a/barbican/api/controllers/versions.py b/barbican/api/controllers/versions.py index bc84448a..16d65d97 100644 --- a/barbican/api/controllers/versions.py +++ b/barbican/api/controllers/versions.py @@ -21,7 +21,6 @@ from barbican.api.controllers import quotas from barbican.api.controllers import secrets from barbican.api.controllers import secretstores from barbican.api.controllers import transportkeys -from barbican.common import config from barbican.common import utils from barbican import i18n as u from barbican import version @@ -29,9 +28,6 @@ from barbican import version LOG = utils.getLogger(__name__) -CONF = config.CONF - - MIME_TYPE_JSON = 'application/json' MIME_TYPE_JSON_HOME = 'application/json-home' MEDIA_TYPE_JSON = 'application/vnd.openstack.key-manager-%s+json' diff --git a/barbican/api/middleware/simple.py b/barbican/api/middleware/simple.py index 4d300be1..34c535e1 100644 --- a/barbican/api/middleware/simple.py +++ b/barbican/api/middleware/simple.py @@ -19,12 +19,10 @@ purposes only. """ from barbican.api import middleware -from barbican.common import config from barbican.common import utils from barbican import i18n as u LOG = utils.getLogger(__name__) -CONF = config.CONF class SimpleFilter(middleware.Middleware): diff --git a/barbican/queue/server.py b/barbican/queue/server.py index bef042a3..4aa6e26f 100644 --- a/barbican/queue/server.py +++ b/barbican/queue/server.py @@ -28,7 +28,6 @@ except ImportError: from oslo_service import service -from barbican.common import config from barbican.common import utils from barbican import i18n as u from barbican.model import models @@ -42,8 +41,6 @@ if newrelic_loaded: LOG = utils.getLogger(__name__) -CONF = config.CONF - # Maps the common/shared RetryTasks (returned from lower-level business logic # and plugin processing) to top-level RPC tasks in the Tasks class below.