From 598ca6bbaabc0b67708a1ecfbef1372eb9927ed9 Mon Sep 17 00:00:00 2001 From: Mohammed Junaid Date: Thu, 7 Feb 2013 07:42:34 +0530 Subject: object-storage: Restoring multi volume support in UFO. * Currently, the users of UFO are restricted to use just one volume at any given point of time. This patch removes this limitation. * The usage of gluster-swift-gen-builders has also changed. With this commit the users should mention the list of volumes that they want to expose through UFO. So, only the volumes mentioned during the ring file generation can be accessed. Usage: gluster-swift-gen-builders []... This is an intermediate fix until we remove the account, container and object server processes. Once we have this frame work running, it will completely eliminate the ring files. Change-Id: I9ad3808519fec9c7c60ad846c4f8b653117a8337 BUG: 909053 Signed-off-by: Mohammed Junaid Reviewed-on: http://review.gluster.org/4485 Tested-by: Gluster Build System Reviewed-by: Kaleb KEITHLEY Reviewed-by: Peter Portante --- ufo/gluster/swift/common/constraints.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'ufo/gluster/swift/common/constraints.py') diff --git a/ufo/gluster/swift/common/constraints.py b/ufo/gluster/swift/common/constraints.py index a4fc8008c7e..dd8662a9d43 100644 --- a/ufo/gluster/swift/common/constraints.py +++ b/ufo/gluster/swift/common/constraints.py @@ -16,7 +16,8 @@ from webob.exc import HTTPBadRequest import swift.common.constraints -from gluster.swift.common import Glusterfs +import swift.common.ring as _ring +from gluster.swift.common import Glusterfs, ring MAX_OBJECT_NAME_COMPONENT_LENGTH = swift.common.constraints.constraints_conf_int( @@ -80,3 +81,9 @@ def gluster_check_mount(root, drive): # Replace the original check mount with ours swift.common.constraints.check_mount = gluster_check_mount + +# Save the original Ring class +__Ring = _ring.Ring + +# Replace the original Ring class +_ring.Ring = ring.Ring -- cgit