summaryrefslogtreecommitdiff
path: root/install-files/swift/usr/share/swift/etc/swift/container-server.j2
diff options
context:
space:
mode:
authorPedro Alvarez <pedro.alvarez@codethink.co.uk>2015-06-01 13:14:36 +0000
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2015-06-04 13:50:41 +0000
commit3e509457fef0eb4fc9c39001d565c003fc62edc9 (patch)
tree1513484ca46f24589e7dcb30f2424eb9e77b3f09 /install-files/swift/usr/share/swift/etc/swift/container-server.j2
parent0d8b3dedd24aea45dddd43f911d57f64da5195c2 (diff)
downloaddefinitions-3e509457fef0eb4fc9c39001d565c003fc62edc9.tar.gz
Swift: Sync configuration files with 2.3.0 (Kilo)
Diffstat (limited to 'install-files/swift/usr/share/swift/etc/swift/container-server.j2')
-rw-r--r--install-files/swift/usr/share/swift/etc/swift/container-server.j28
1 files changed, 8 insertions, 0 deletions
diff --git a/install-files/swift/usr/share/swift/etc/swift/container-server.j2 b/install-files/swift/usr/share/swift/etc/swift/container-server.j2
index d226d016..3c63b7d0 100644
--- a/install-files/swift/usr/share/swift/etc/swift/container-server.j2
+++ b/install-files/swift/usr/share/swift/etc/swift/container-server.j2
@@ -168,6 +168,14 @@ recon_cache_path = /var/cache/swift
#
# Maximum amount of time to spend syncing each container per pass
# container_time = 60
+#
+# Maximum amount of time in seconds for the connection attempt
+# conn_timeout = 5
+# Server errors from requests will be retried by default
+# request_tries = 3
+#
+# Internal client config file path
+# internal_client_conf_path = /etc/swift/internal-client.conf
# Note: Put it at the beginning of the pipeline to profile all middleware. But
# it is safer to put this after healthcheck.