Merge "Use importutils from oslo.utils"

9 files changed, 8 insertions, 9 deletions

diff --git a/keystone/auth/controllers.py b/keystone/auth/controllers.py
index 87ebb7cc2..3943c1f6a 100644
--- a/keystone/auth/controllers.py
+++ b/keystone/auth/controllers.py
@@ -16,6 +16,7 @@ import sys
 
 from keystoneclient.common import cms
 from oslo.serialization import jsonutils
+from oslo.utils import importutils
 from oslo.utils import timeutils
 import six
 
@@ -28,7 +29,6 @@ from keystone import config
 from keystone.contrib import federation
 from keystone import exception
 from keystone.i18n import _, _LI
-from keystone.openstack.common import importutils
 from keystone.openstack.common import log
 
 
diff --git a/keystone/common/cache/backends/mongo.py b/keystone/common/cache/backends/mongo.py
index 0a30ea0bc..c9d25d1aa 100644
--- a/keystone/common/cache/backends/mongo.py
+++ b/keystone/common/cache/backends/mongo.py
@@ -17,12 +17,12 @@ import datetime
 
 from dogpile.cache import api
 from dogpile.cache import util as dp_util
+from oslo.utils import importutils
 from oslo.utils import timeutils
 import six
 
 from keystone import exception
 from keystone.i18n import _
-from keystone.openstack.common import importutils
 from keystone.openstack.common import log
 
 
diff --git a/keystone/common/cache/core.py b/keystone/common/cache/core.py
index 3ba528747..46edb531d 100644
--- a/keystone/common/cache/core.py
+++ b/keystone/common/cache/core.py
@@ -17,11 +17,11 @@
 import dogpile.cache
 from dogpile.cache import proxy
 from dogpile.cache import util
+from oslo.utils import importutils
 
 from keystone import config
 from keystone import exception
 from keystone.i18n import _
-from keystone.openstack.common import importutils
 from keystone.openstack.common import log
 
 
diff --git a/keystone/common/kvs/core.py b/keystone/common/kvs/core.py
index ea476cb8c..624dbfd88 100644
--- a/keystone/common/kvs/core.py
+++ b/keystone/common/kvs/core.py
@@ -22,6 +22,7 @@ from dogpile.cache import proxy
 from dogpile.cache import region
 from dogpile.cache import util as dogpile_util
 from dogpile.core import nameregistry
+from oslo.utils import importutils
 import six
 
 from keystone.common import config
@@ -29,7 +30,6 @@ from keystone import exception
 from keystone.i18n import _
 from keystone.i18n import _LI
 from keystone.i18n import _LW
-from keystone.openstack.common import importutils
 from keystone.openstack.common import log
 
 
diff --git a/keystone/common/manager.py b/keystone/common/manager.py
index c85a25f1d..02ec853d7 100644
--- a/keystone/common/manager.py
+++ b/keystone/common/manager.py
@@ -14,7 +14,7 @@
 
 import functools
 
-from keystone.openstack.common import importutils
+from oslo.utils import importutils
 
 
 def response_truncated(f):
diff --git a/keystone/common/sql/migration_helpers.py b/keystone/common/sql/migration_helpers.py
index 606786031..10698d2a2 100644
--- a/keystone/common/sql/migration_helpers.py
+++ b/keystone/common/sql/migration_helpers.py
@@ -21,6 +21,7 @@ import migrate
 from migrate import exceptions
 from oslo.db.sqlalchemy import migration
 from oslo.serialization import jsonutils
+from oslo.utils import importutils
 import six
 import sqlalchemy
 
@@ -30,7 +31,6 @@ from keystone import config
 from keystone import contrib
 from keystone import exception
 from keystone.i18n import _
-from keystone.openstack.common import importutils
 
 
 CONF = config.CONF
diff --git a/keystone/common/wsgi.py b/keystone/common/wsgi.py
index 6ccd7e2a4..9b678864a 100644
--- a/keystone/common/wsgi.py
+++ b/keystone/common/wsgi.py
@@ -22,6 +22,7 @@ import copy
 
 from oslo import i18n
 from oslo.serialization import jsonutils
+from oslo.utils import importutils
 import routes.middleware
 import six
 import webob.dec
@@ -35,7 +36,6 @@ from keystone.i18n import _
 from keystone.i18n import _LI
 from keystone.i18n import _LW
 from keystone.models import token_model
-from keystone.openstack.common import importutils
 from keystone.openstack.common import log
 
 
diff --git a/keystone/identity/core.py b/keystone/identity/core.py
index b363c47c2..ef0b36f6f 100644
--- a/keystone/identity/core.py
+++ b/keystone/identity/core.py
@@ -20,6 +20,7 @@ import os
 import uuid
 
 from oslo.config import cfg
+from oslo.utils import importutils
 import six
 
 from keystone import clean
@@ -31,7 +32,6 @@ from keystone import exception
 from keystone.i18n import _
 from keystone.identity.mapping_backends import mapping
 from keystone import notifications
-from keystone.openstack.common import importutils
 from keystone.openstack.common import log
 
 
diff --git a/openstack-common.conf b/openstack-common.conf
index fd6cb41df..a16499a70 100644
--- a/openstack-common.conf
+++ b/openstack-common.conf
@@ -2,7 +2,6 @@
 
 module=config
 module=gettextutils
-module=importutils
 module=log
 module=policy
 module=processutils