diff options
| -rw-r--r-- | etc/proxy-server.conf-gluster | 17 | ||||
| -rw-r--r-- | gluster/swift/common/middleware/gluster.py | 40 |
2 files changed, 1 insertions, 56 deletions
diff --git a/etc/proxy-server.conf-gluster b/etc/proxy-server.conf-gluster index 331fb02..bc46afa 100644 --- a/etc/proxy-server.conf-gluster +++ b/etc/proxy-server.conf-gluster @@ -6,7 +6,7 @@ log_facility = LOG_LOCAL1 workers = 1 [pipeline:main] -pipeline = healthcheck cache tempauth proxy-server +pipeline = healthcheck cache proxy-server [app:proxy-server] use = egg:gluster_swift#proxy @@ -44,21 +44,6 @@ object_chunk_size = 65536 # for object_chunk_size. put_queue_depth = 10 -[filter:tempauth] -use = egg:swift#tempauth -# Here you need to add users explicitly. See the OpenStack Swift Deployment -# Guide for more information. The user and user64 directives take the -# following form: -# user_<account>_<username> = <key> [group] [group] [...] [storage_url] -# user64_<account_b64>_<username_b64> = <key> [group] [group] [...] [storage_url] -# Where you use user64 for accounts and/or usernames that include underscores. -# -# NOTE (and WARNING): The account name must match the device name specified -# when generating the account, container, and object build rings. -# -# E.g. -# user_ufo0_admin = abc123 .admin - [filter:healthcheck] use = egg:swift#healthcheck diff --git a/gluster/swift/common/middleware/gluster.py b/gluster/swift/common/middleware/gluster.py deleted file mode 100644 index ab63c51..0000000 --- a/gluster/swift/common/middleware/gluster.py +++ /dev/null @@ -1,40 +0,0 @@ -# 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. - -# Noop Middleware that simply allows us to monkey patch the constraints -import gluster.swift.common.constraints - -class Gluster(object): - """ - Noop middleware for use with the proxy server to get paste.deploy to load - this middleware such that the plugin constraints monkey patch the common - constraints ahead of their use. - """ - def __init__(self, app, conf): - self.app = app - self.conf = conf - - def __call__(self, env, start_response): - return self.app(env, start_response) - - -def filter_factory(global_conf, **local_conf): - """Returns a WSGI filter app for use with paste.deploy.""" - conf = global_conf.copy() - conf.update(local_conf) - - def gluster_filter(app): - return Gluster(app, conf) - return gluster_filter |