summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorAlan Pevec <apevec@redhat.com>2013-02-17 00:05:40 +0100
committerAlan Pevec <apevec@redhat.com>2013-02-17 00:35:40 +0100
commit57c4997dcb8ce491b53bcdca693a99eda4b3b0fb (patch)
treeebf3998676505de418bf216da1a4857238829e51 /tools
parent5d062e04a3312b10489f5f24a7d741ef005da679 (diff)
downloadpython-keystoneclient-57c4997dcb8ce491b53bcdca693a99eda4b3b0fb.tar.gz
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. Removes the load of copied-and-pasted cfg from each application in authtoken middleware. Depends on oslo-config deployments: Nova I4815aeb8a9341a31a250e920157f15ee15cfc5bc Glance I4815aeb8a9341a31a250e920157f15ee15cfc5bc Quantum I4815aeb8a9341a31a250e920157f15ee15cfc5bc Cinder I4815aeb8a9341a31a250e920157f15ee15cfc5bc 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. Change-Id: I18c450174277c8e2d15ed93879da6cd92074c27a
Diffstat (limited to 'tools')
-rw-r--r--tools/install_venv_common.py2
-rw-r--r--tools/pip-requires1
2 files changed, 2 insertions, 1 deletions
diff --git a/tools/install_venv_common.py b/tools/install_venv_common.py
index bfebe4a..ebd8940 100644
--- a/tools/install_venv_common.py
+++ b/tools/install_venv_common.py
@@ -32,7 +32,7 @@ if os.path.exists(os.path.join(possible_topdir, "keystoneclient",
sys.path.insert(0, possible_topdir)
-from keystoneclient.openstack.common import cfg
+from oslo.config import cfg
class InstallVenv(object):
diff --git a/tools/pip-requires b/tools/pip-requires
index 81d0663..ec5fddf 100644
--- a/tools/pip-requires
+++ b/tools/pip-requires
@@ -3,3 +3,4 @@ iso8601>=0.1.4
prettytable
requests>=0.8.8
simplejson
+http://tarballs.openstack.org/oslo-config/oslo-config-2013.1b3.tar.gz#egg=oslo-config