diff --git a/murano/api/middleware/version_negotiation.py b/murano/api/middleware/version_negotiation.py index 2f28de5d..b8e7dbac 100644 --- a/murano/api/middleware/version_negotiation.py +++ b/murano/api/middleware/version_negotiation.py @@ -18,14 +18,12 @@ and/or Accept headers and attempts to negotiate an API controller to return """ -from oslo_config import cfg from oslo_log import log as logging from murano.api import versions from murano.common.i18n import _LW from murano.common import wsgi -CONF = cfg.CONF LOG = logging.getLogger(__name__) diff --git a/murano/api/versions.py b/murano/api/versions.py index eab6989c..1873d051 100644 --- a/murano/api/versions.py +++ b/murano/api/versions.py @@ -12,7 +12,6 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo_config import cfg from oslo_serialization import jsonutils from six.moves import http_client import webob.dec @@ -20,9 +19,6 @@ import webob.dec from murano.common import wsgi -CONF = cfg.CONF - - class Controller(object): """A wsgi controller that reports which API versions are supported.""" diff --git a/murano/db/catalog/api.py b/murano/db/catalog/api.py index 74163792..4ec18341 100644 --- a/murano/db/catalog/api.py +++ b/murano/db/catalog/api.py @@ -12,7 +12,6 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo_config import cfg from oslo_db import api as oslo_db_api from oslo_db import exception as db_exceptions from oslo_db.sqlalchemy import utils @@ -29,8 +28,6 @@ from murano.db import session as db_session from murano.common.i18n import _, _LW -CONF = cfg.CONF - SEARCH_MAPPING = {'fqn': 'fully_qualified_name', 'name': 'name', 'created': 'created' diff --git a/murano/engine/system/test_fixture.py b/murano/engine/system/test_fixture.py index 28c14b57..2e7d7c40 100644 --- a/murano/engine/system/test_fixture.py +++ b/murano/engine/system/test_fixture.py @@ -13,17 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. -from oslo_config import cfg - import testtools from murano.dsl import dsl from murano.dsl import helpers -CONF = cfg.CONF - - @dsl.name('io.murano.test.TestFixture') class TestFixture(object): def __init__(self): diff --git a/murano/policy/model_policy_enforcer.py b/murano/policy/model_policy_enforcer.py index 06eb7ed2..affdbbb8 100644 --- a/murano/policy/model_policy_enforcer.py +++ b/murano/policy/model_policy_enforcer.py @@ -20,7 +20,6 @@ try: import congressclient.v1.client as congress_client except ImportError as congress_client_import_error: congress_client = None -from oslo_config import cfg from oslo_log import log as logging from murano.common import auth_utils @@ -30,7 +29,6 @@ from murano.policy.modify.actions import action_manager as am LOG = logging.getLogger(__name__) -CONF = cfg.CONF class ValidationError(Exception): diff --git a/murano/tests/unit/cmd/test_api_workers.py b/murano/tests/unit/cmd/test_api_workers.py index 2c37acea..20fabc50 100644 --- a/murano/tests/unit/cmd/test_api_workers.py +++ b/murano/tests/unit/cmd/test_api_workers.py @@ -14,7 +14,6 @@ import mock import sys from oslo_concurrency import processutils -from oslo_config import cfg from oslo_log import log as logging from murano.cmd import api @@ -23,8 +22,6 @@ from murano.common import config from murano.common import policy from murano.tests.unit import base -CONF = cfg.CONF - class TestAPIWorkers(base.MuranoTestCase): diff --git a/murano/tests/unit/cmd/test_engine_workers.py b/murano/tests/unit/cmd/test_engine_workers.py index 6a923b9d..523403a3 100644 --- a/murano/tests/unit/cmd/test_engine_workers.py +++ b/murano/tests/unit/cmd/test_engine_workers.py @@ -15,15 +15,12 @@ import mock from oslo_concurrency import processutils -from oslo_config import cfg from oslo_log import log as logging from murano.cmd import engine from murano.common import config from murano.tests.unit import base -CONF = cfg.CONF - class TestEngineWorkers(base.MuranoTestCase):