From 3a75da67cbcf09c19df2a9dca2f576d51ed2191d Mon Sep 17 00:00:00 2001 From: Peter Portante Date: Mon, 29 Apr 2013 23:04:06 -0400 Subject: Remove "ufo" directory, promoting contents to top-level Additionally, we drop the "ufo" references from setup.py, spec file and README, and add the HISTORY file describing how the repo was initially created. We also update the RPM spec file to use the name "gluster-for-swift" to avoid colliding with existing RPM names from RHS 2.0 (the spec file's description was also updated, along with the version number). Change-Id: If804224a94208d57896e4189c63736ffc9e01d5e Signed-off-by: Peter Portante Reviewed-on: http://review.gluster.org/4966 Reviewed-by: Luis Pabon Reviewed-by: Mohammed Junaid Reviewed-by: Kaleb KEITHLEY Reviewed-by: Peter Portante Tested-by: Peter Portante --- gluster/swift/container/__init__.py | 0 gluster/swift/container/server.py | 46 +++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+) create mode 100644 gluster/swift/container/__init__.py create mode 100644 gluster/swift/container/server.py (limited to 'gluster/swift/container') diff --git a/gluster/swift/container/__init__.py b/gluster/swift/container/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/gluster/swift/container/server.py b/gluster/swift/container/server.py new file mode 100644 index 0000000..c5792aa --- /dev/null +++ b/gluster/swift/container/server.py @@ -0,0 +1,46 @@ +# Copyright (c) 2012 Red Hat, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or +# implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +""" Container Server for Gluster Swift UFO """ + +# Simply importing this monkey patches the constraint handling to fit our +# needs +import gluster.swift.common.constraints + +from swift.container import server +from gluster.swift.common.DiskDir import DiskDir + + +class ContainerController(server.ContainerController): + def _get_container_broker(self, drive, part, account, container): + """ + Overriden to provide the GlusterFS specific broker that talks to + Gluster for the information related to servicing a given request + instead of talking to a database. + + :param drive: drive that holds the container + :param part: partition the container is in + :param account: account name + :param container: container name + :returns: DiskDir object + """ + return DiskDir(self.root, drive, account, container, self.logger) + + +def app_factory(global_conf, **local_conf): + """paste.deploy app factory for creating WSGI container server apps.""" + conf = global_conf.copy() + conf.update(local_conf) + return ContainerController(conf) -- cgit