From 909c44a0fb80a3b4bafb82b0b3b8de7b7bd29826 Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Sun, 10 Feb 2013 18:50:40 -0500 Subject: Use oslo-config-2013.1b3 The cfg API is now available via the oslo-config library, so switch to it and remove the copied-and-pasted version. Add the 2013.1b3 tarball to tools/pip-requires - this will be changed to 'oslo-config>=2013.1' when oslo-config is published to pypi. This will happen in time for grizzly final. Remove the 'deps = pep8==1.3.3' from tox.ini as it means all the other deps get installed with easy_install which can't install oslo-config from the URL. Change-Id: I4815aeb8a9341a31a250e920157f15ee15cfc5bc --- keystone/config.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'keystone/config.py') diff --git a/keystone/config.py b/keystone/config.py index b604db43..fc2ce743 100644 --- a/keystone/config.py +++ b/keystone/config.py @@ -18,9 +18,9 @@ import gettext import os import sys -from keystone.common import logging -from keystone.openstack.common import cfg +from oslo.config import cfg +from keystone.common import logging gettext.install('keystone', unicode=1) -- cgit