summaryrefslogtreecommitdiffstats
path: root/openstack-common.conf
diff options
context:
space:
mode:
authorMark McLoughlin <markmc@redhat.com>2013-02-15 22:30:16 +0000
committerVishvananda Ishaya <vishvananda@gmail.com>2013-02-19 21:16:32 -0800
commit706a1370056ffccc2c8811fc1ac0679944564ece (patch)
tree0b71139bbf282e7909b0df37a69a2aaa8f3e32d2 /openstack-common.conf
parentd62205f316ad9490e1379e943972a007e071c688 (diff)
downloadnova-706a1370056ffccc2c8811fc1ac0679944564ece.tar.gz
nova-706a1370056ffccc2c8811fc1ac0679944564ece.tar.xz
nova-706a1370056ffccc2c8811fc1ac0679944564ece.zip
Use oslo-config-2013.1b4
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.1b4 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. Add dependency_links to setup.py so that oslo-config can be installed from the tarball URL specified in pip-requires. 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. Make tools/hacking.py include oslo in IMPORT_EXCEPTIONS like it already does for paste. It turns out imp.find_module() doesn't correct handle namespace packages. Retain dummy cfg.py file until keystoneclient middleware has been updated (I18c450174277c8e2d15ed93879da6cd92074c27a). Change-Id: I4815aeb8a9341a31a250e920157f15ee15cfc5bc
Diffstat (limited to 'openstack-common.conf')
-rw-r--r--openstack-common.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/openstack-common.conf b/openstack-common.conf
index fcff378b5..abbc7570e 100644
--- a/openstack-common.conf
+++ b/openstack-common.conf
@@ -1,7 +1,7 @@
[DEFAULT]
# The list of modules to copy from openstack-common
-modules=cfg,cliutils,context,db,db.sqlalchemy,excutils,eventlet_backdoor,fileutils,gettextutils,importutils,iniparser,jsonutils,local,lockutils,log,network_utils,notifier,plugin,policy,rootwrap,setup,timeutils,rpc,uuidutils,install_venv_common,flakes,version
+modules=cliutils,context,db,db.sqlalchemy,excutils,eventlet_backdoor,fileutils,gettextutils,importutils,jsonutils,local,lockutils,log,network_utils,notifier,plugin,policy,rootwrap,setup,timeutils,rpc,uuidutils,install_venv_common,flakes,version
# The base module to hold the copy of openstack.common
base=nova