Merge "TrivialFix: Remove cfg import unused"

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__)
 
 

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."""

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'

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):

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):

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):
 

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):