openstack/aodh
Code Issues Proposed changes

Add support for Folsom version of Swift

Browse Source 
This fixes bug #1095897

Change-Id: Idb7a94f103ffd23356938712ed9d2185eed22b98
Signed-off-by: Julien Danjou <julien@danjou.info>
This commit is contained in:
Julien Danjou 2013-01-04 10:33:36 +01:00
parent f73d9bfc06
commit cd0f6c28f1
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ceilometer/objectstore/swift_middleware.py
View File

@ -26,8 +26,14 @@ from ceilometer.openstack.common import cfg
from ceilometer.openstack.common import context from ceilometer.openstack.common import context
from ceilometer.openstack.common import timeutils from ceilometer.openstack.common import timeutils
from swift.common.swob import Request
from swift.common.utils import split_path from swift.common.utils import split_path
try:
# Swift >= 1.7.5
from swift.common.swob import Request
except ImportError:
from webob import Request
try: try:
# Swift > 1.7.5 # Swift > 1.7.5
from swift.common.utils import InputProxy from swift.common.utils import InputProxy

4
tools/test-requires-folsom
View File

@ -21,7 +21,7 @@ setuptools-git>=0.4
# very soon. # very soon.
hg+https://bitbucket.org/cdevienne/wsme hg+https://bitbucket.org/cdevienne/wsme
pecan pecan
# We should use swift>1.7.5, but it's not yet available # 1.7.4 is the Folsom release
swift http://tarballs.openstack.org/swift/swift-stable-folsom.tar.gz
# Swift dep that is not necessary if we depend on swift>1.7.5 # Swift dep that is not necessary if we depend on swift>1.7.5
netifaces netifaces