diff options
| author | Mark McLoughlin <markmc@redhat.com> | 2013-02-18 12:38:10 +0000 |
|---|---|---|
| committer | Mark McLoughlin <markmc@redhat.com> | 2013-02-18 12:38:10 +0000 |
| commit | 5181724ecea74117c1d3effe4ccb827b113f1662 (patch) | |
| tree | ef72f0d1f51f1268b6b51abff718b37a0bef2949 /ceilometer/objectstore/swift.py | |
| parent | f6ae203c98c5bc1ebdff97ebae316c333ac8f9cd (diff) | |
| download | ceilometer-5181724ecea74117c1d3effe4ccb827b113f1662.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.
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.
For each testenv in tox.ini which overrides the base testenv deps list,
explicitly include {pip,test}-requires in the list so that oslo-config
doesn't fail to install later when easy_install attempts to install
the tarball when doing 'python setup.py install'.
Retain dummy cfg.py file until keystoneclient middleware has been
updated (I18c450174277c8e2d15ed93879da6cd92074c27a).
Change-Id: I4815aeb8a9341a31a250e920157f15ee15cfc5bc
Diffstat (limited to 'ceilometer/objectstore/swift.py')
| -rw-r--r-- | ceilometer/objectstore/swift.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ceilometer/objectstore/swift.py b/ceilometer/objectstore/swift.py index ff483bcc..f7199028 100644 --- a/ceilometer/objectstore/swift.py +++ b/ceilometer/objectstore/swift.py @@ -22,11 +22,11 @@ from __future__ import absolute_import import abc +from oslo.config import cfg from swiftclient import client as swift from ceilometer import plugin from ceilometer import counter -from ceilometer.openstack.common import cfg from ceilometer.openstack.common import timeutils from ceilometer.openstack.common import log |