diff --git a/openstack-common.conf b/openstack-common.conf index f8d80d966c..6f6aeb01a1 100644 --- a/openstack-common.conf +++ b/openstack-common.conf @@ -6,7 +6,6 @@ module=eventlet_backdoor module=exception module=fileutils module=gettextutils -module=jsonutils module=local module=log module=loopingcall diff --git a/requirements.txt b/requirements.txt index 9ebb429a3d..92f6274a1e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -28,7 +28,8 @@ jsonschema>=2.0.0,<3.0.0 Jinja2>=2.6 # BSD License (3 clause) pexpect>=3.1 # ISC License oslo.config>=1.4.0 # Apache-2.0 -oslo.utils>=1.1.0 # Apache-2.0 +oslo.serialization>=1.0.0 +oslo.utils>=1.1.0 MySQL-python Babel>=1.3 six>=1.7.0 diff --git a/trove/common/limits.py b/trove/common/limits.py index 566cd0d13f..f0cfa522b2 100644 --- a/trove/common/limits.py +++ b/trove/common/limits.py @@ -30,7 +30,7 @@ from trove.common import cfg from trove.common import wsgi as base_wsgi -from trove.openstack.common import jsonutils +from oslo.serialization import jsonutils from trove.openstack.common import wsgi from trove.openstack.common.gettextutils import _ diff --git a/trove/common/wsgi.py b/trove/common/wsgi.py index febdc49747..05da44c83f 100644 --- a/trove/common/wsgi.py +++ b/trove/common/wsgi.py @@ -30,7 +30,7 @@ from trove.common import exception from trove.common import utils from trove.openstack.common.gettextutils import _ -from trove.openstack.common import jsonutils +from oslo.serialization import jsonutils from trove.openstack.common import pastedeploy from trove.openstack.common import service diff --git a/trove/tests/unittests/api/common/test_limits.py b/trove/tests/unittests/api/common/test_limits.py index 396b273c90..356f667b12 100644 --- a/trove/tests/unittests/api/common/test_limits.py +++ b/trove/tests/unittests/api/common/test_limits.py @@ -29,7 +29,7 @@ from trove.common.limits import Limit from trove.limits import views from trove.limits.service import LimitsController -from trove.openstack.common import jsonutils +from oslo.serialization import jsonutils from trove.quota.quota import QUOTAS TEST_LIMITS = [