summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-02-19 18:34:50 +0000
committerGerrit Code Review <review@openstack.org>2013-02-19 18:34:50 +0000
commite50a957b44d7925cf87375c05098e8ef77b0093f (patch)
tree0f50dd76d5c40d024999d0d4d2bc3aa138b67924 /tools
parent777c2d12eefd66155d85b22db6a284faecc23562 (diff)
parent909c44a0fb80a3b4bafb82b0b3b8de7b7bd29826 (diff)
downloadkeystone-e50a957b44d7925cf87375c05098e8ef77b0093f.tar.gz
keystone-e50a957b44d7925cf87375c05098e8ef77b0093f.tar.xz
keystone-e50a957b44d7925cf87375c05098e8ef77b0093f.zip
Merge "Use oslo-config-2013.1b3"
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 9c5cb446..dd1977e4 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, "keystone",
sys.path.insert(0, possible_topdir)
-from keystone.openstack.common import cfg
+from oslo.config import cfg
class InstallVenv(object):
diff --git a/tools/pip-requires b/tools/pip-requires
index de4a1b9b..f331eb9d 100644
--- a/tools/pip-requires
+++ b/tools/pip-requires
@@ -12,3 +12,4 @@ passlib
lxml
iso8601>=0.1.4
python-keystoneclient>=0.2,<0.3
+http://tarballs.openstack.org/oslo-config/oslo-config-2013.1b3.tar.gz#egg=oslo-config