openstack/neutron-lbaas
Code Issues Proposed changes

Use oslo-config-2013.1b3

Browse Source 
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' from tox.ini as it means all the other deps
get installed with easy_install which can't install oslo-config from
the URL.

Retain dummy cfg.py file until keystoneclient middleware has been
updated (I18c450174277c8e2d15ed93879da6cd92074c27a).

Change-Id: I4815aeb8a9341a31a250e920157f15ee15cfc5bc
This commit is contained in:
Mark McLoughlin 2013-02-10 19:00:19 -05:00
parent e07be22254
commit f6f9a05e12
4 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openstack-common.conf
View File

@ -1,5 +1,5 @@
[DEFAULT]
# The list of modules to copy from openstack-common
modules=cfg,context,eventlet_backdoor,exception,excutils,fileutils,gettextutils,importutils,iniparser,install_venv_common,jsonutils,local,lockutils,log,loopingcall,network_utils,notifier,periodic_task,policy,processutils,rpc,service,setup,threadgroup,timeutils,uuidutils,version
modules=context,eventlet_backdoor,exception,excutils,fileutils,gettextutils,importutils,install_venv_common,jsonutils,local,lockutils,log,loopingcall,network_utils,notifier,periodic_task,policy,processutils,rpc,service,setup,threadgroup,timeutils,uuidutils,version
# The base module to hold the copy of openstack.common
base=quantum

2
tools/install_venv_common.py
View File

@ -32,7 +32,7 @@ if os.path.exists(os.path.join(possible_topdir, "quantum",
sys.path.insert(0, possible_topdir)
from quantum.openstack.common import cfg
from oslo.config import cfg
class InstallVenv(object):

1
tools/pip-requires
View File

@ -16,6 +16,7 @@ sqlalchemy==0.7.9
WebOb>=1.2
python-keystoneclient>=0.2.0
alembic>=0.4.1
http://tarballs.openstack.org/oslo-config/oslo-config-2013.1b3.tar.gz#egg=oslo-config
# Cisco plugin dependencies
python-novaclient

2
tox.ini
View File

@ -19,8 +19,6 @@ sitepackages = True
downloadcache = ~/cache/pip
[testenv:pep8]
deps = pep8
setuptools_git>=0.4
commands =
pep8 --repeat --show-source --ignore=E125 --exclude=.venv,.tox,dist,doc,openstack,*egg .
pep8 --repeat --show-source --ignore=E125 --filename=quantum* bin