From 2c7768a3cbc742ae2f6c01011e3d56a94720b54c Mon Sep 17 00:00:00 2001
From: Kota Tsuyuzaki <tsuyuzaki.kota@lab.ntt.co.jp>
Date: Tue, 1 May 2018 16:32:04 +0900
Subject: [PATCH] Small cleanup on s3api

This patch is one of follow up to remove unnecessary
files, and a comment in the code.

The conf files are used to setup functests environment
in the past swift3 repository but that should port to
setuppers of functests (see related change). Anyway,
we don't need shell based older conf.in script on that way.

Change-Id: If431979ea6fa373ac1cde4b7e13d57d91fb15be8
Related-Change: I6f30f74678ad35479da237361bee48c46c0ecc49
---
 doc/s3api/conf/ceph-s3.conf.in         | 18 ------------------
 doc/s3api/conf/object-server.conf.in   | 17 -----------------
 swift/common/middleware/s3api/utils.py |  1 -
 3 files changed, 36 deletions(-)
 delete mode 100644 doc/s3api/conf/ceph-s3.conf.in
 delete mode 100644 doc/s3api/conf/object-server.conf.in

diff --git a/doc/s3api/conf/ceph-s3.conf.in b/doc/s3api/conf/ceph-s3.conf.in
deleted file mode 100644
index 65de8053c6..0000000000
--- a/doc/s3api/conf/ceph-s3.conf.in
+++ /dev/null
@@ -1,18 +0,0 @@
-[DEFAULT]
-host = localhost
-port = 8080
-is_secure = no
-
-[s3 main]
-user_id = %ADMIN_ACCESS_KEY%
-display_name = %ADMIN_ACCESS_KEY%
-email = %ADMIN_ACCESS_KEY%
-access_key = %ADMIN_ACCESS_KEY%
-secret_key = %ADMIN_SECRET_KEY%
-
-[s3 alt]
-user_id = %TESTER_ACCESS_KEY%
-display_name = %TESTER_ACCESS_KEY%
-email = %TESTER_ACCESS_KEY%
-access_key = %TESTER_ACCESS_KEY%
-secret_key = %TESTER_SECRET_KEY%
diff --git a/doc/s3api/conf/object-server.conf.in b/doc/s3api/conf/object-server.conf.in
deleted file mode 100644
index 9cf7dd58db..0000000000
--- a/doc/s3api/conf/object-server.conf.in
+++ /dev/null
@@ -1,17 +0,0 @@
-[DEFAULT]
-user = %USER%
-bind_port = 6000
-swift_dir = %TEST_DIR%/etc
-devices = %TEST_DIR%
-mount_check = false
-workers = 1
-log_level = DEBUG
-
-[pipeline:main]
-pipeline = object-server
-
-[app:object-server]
-use = egg:swift#object
-allowed_headers = Cache-Control, Content-Disposition, Content-Encoding,
- Content-Language, Expires, X-Delete-At, X-Object-Manifest, X-Robots-Tag,
- X-Static-Large-Object
diff --git a/swift/common/middleware/s3api/utils.py b/swift/common/middleware/s3api/utils.py
index 813d979181..4628d2921c 100644
--- a/swift/common/middleware/s3api/utils.py
+++ b/swift/common/middleware/s3api/utils.py
@@ -20,7 +20,6 @@ import re
 import time
 import uuid
 
-# Need for check_path_header
 from swift.common import utils
 
 MULTIUPLOAD_SUFFIX = '+segments'