From 08825e46db0fbc921224ab350e0640b0207c42b1 Mon Sep 17 00:00:00 2001 From: Julien Danjou Date: Wed, 5 Aug 2015 10:43:40 +0200 Subject: [PATCH] Stop using openstack.common from keystoneclient They switched away from it. Change-Id: Iea7fd67d764443dfb6e7192ab3dff475bc2e3095 Closes-Bug: #1481501 --- ceilometer/api/controllers/v2/root.py | 2 +- ceilometer/tests/api/v2/test_api_upgrade.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ceilometer/api/controllers/v2/root.py b/ceilometer/api/controllers/v2/root.py index b97b1af1..8aee4a01 100644 --- a/ceilometer/api/controllers/v2/root.py +++ b/ceilometer/api/controllers/v2/root.py @@ -18,7 +18,7 @@ # License for the specific language governing permissions and limitations # under the License. -from keystoneclient.openstack.common.apiclient import exceptions +from keystoneclient import exceptions from oslo_config import cfg from oslo_log import log import pecan diff --git a/ceilometer/tests/api/v2/test_api_upgrade.py b/ceilometer/tests/api/v2/test_api_upgrade.py index 16fabcfa..0fb38a36 100644 --- a/ceilometer/tests/api/v2/test_api_upgrade.py +++ b/ceilometer/tests/api/v2/test_api_upgrade.py @@ -11,7 +11,7 @@ # License for the specific language governing permissions and limitations # under the License. -from keystoneclient.openstack.common.apiclient import exceptions +from keystoneclient import exceptions import mock from oslotest import mockpatch