From a8d59075bfff1428c34ade2ad2e13fa51e3f6dbb Mon Sep 17 00:00:00 2001 From: Peter Portante Date: Wed, 21 Nov 2012 16:42:15 -0500 Subject: object-storage: fix account mapping Fix the account mapping so that we always use what is provided by the request. With this fix, "/mnt/gluster-object/AUTH_ufo0" directory hierachies won't be created. But this fix does not restore the one-to-one account to gluster volume name mapping. When the user runs the /usr/bin/gluster-swift-gen-builders script, it still only allows one cluster volume, and that is the only volume that is used. So the account names are effectively ignored. A future set of changes will address that problem. Change-Id: I2df608de2f00fd356a09c500d49fe12cc1a0a574 BUG: 870589 Signed-off-by: Peter Portante Reviewed-on: http://review.gluster.org/4222 Reviewed-by: Kaleb KEITHLEY Tested-by: Kaleb KEITHLEY Reviewed-by: Mohammed Junaid --- ufo/gluster/swift/common/DiskFile.py | 1 - 1 file changed, 1 deletion(-) (limited to 'ufo/gluster/swift/common/DiskFile.py') diff --git a/ufo/gluster/swift/common/DiskFile.py b/ufo/gluster/swift/common/DiskFile.py index 6404be6d..ddb53ed4 100644 --- a/ufo/gluster/swift/common/DiskFile.py +++ b/ufo/gluster/swift/common/DiskFile.py @@ -57,7 +57,6 @@ class Gluster_DiskFile(DiskFile): logger, keep_data_fp=False, disk_chunk_size=65536, uid=DEFAULT_UID, gid=DEFAULT_GID): self.disk_chunk_size = disk_chunk_size - device = account #Don't support obj_name ending/begining with '/', like /a, a/, /a/b/ etc obj = obj.strip('/') if '/' in obj: -- cgit