Update saio sample config files

Added healthcheck middleware to account, container, object servers
Added the s3api, keymaster, encryption config to the proxy config
file to make it easy to enable it.

Change-Id: I96f120c5bc416e9aba388cbfa6c30b648d6ade2f

13 files changed, 62 insertions, 12 deletions

diff --git a/doc/saio/swift/account-server/1.conf b/doc/saio/swift/account-server/1.conf
index 91ded8905..4bdc05ed6 100644
--- a/doc/saio/swift/account-server/1.conf
+++ b/doc/saio/swift/account-server/1.conf
@@ -11,7 +11,7 @@ recon_cache_path = /var/cache/swift
 eventlet_debug = true
 
 [pipeline:main]
-pipeline = recon account-server
+pipeline = healthcheck recon account-server
 
 [app:account-server]
 use = egg:swift#account
@@ -19,6 +19,9 @@ use = egg:swift#account
 [filter:recon]
 use = egg:swift#recon
 
+[filter:healthcheck]
+use = egg:swift#healthcheck
+
 [account-replicator]
 rsync_module = {replication_ip}::account{replication_port}
 
diff --git a/doc/saio/swift/account-server/2.conf b/doc/saio/swift/account-server/2.conf
index 37cae43df..087b7fb7a 100644
--- a/doc/saio/swift/account-server/2.conf
+++ b/doc/saio/swift/account-server/2.conf
@@ -11,7 +11,7 @@ recon_cache_path = /var/cache/swift2
 eventlet_debug = true
 
 [pipeline:main]
-pipeline = recon account-server
+pipeline = healthcheck recon account-server
 
 [app:account-server]
 use = egg:swift#account
@@ -19,6 +19,9 @@ use = egg:swift#account
 [filter:recon]
 use = egg:swift#recon
 
+[filter:healthcheck]
+use = egg:swift#healthcheck
+
 [account-replicator]
 rsync_module = {replication_ip}::account{replication_port}
 
diff --git a/doc/saio/swift/account-server/3.conf b/doc/saio/swift/account-server/3.conf
index 8931672ea..678209abc 100644
--- a/doc/saio/swift/account-server/3.conf
+++ b/doc/saio/swift/account-server/3.conf
@@ -11,7 +11,7 @@ recon_cache_path = /var/cache/swift3
 eventlet_debug = true
 
 [pipeline:main]
-pipeline = recon account-server
+pipeline = healthcheck recon account-server
 
 [app:account-server]
 use = egg:swift#account
@@ -19,6 +19,9 @@ use = egg:swift#account
 [filter:recon]
 use = egg:swift#recon
 
+[filter:healthcheck]
+use = egg:swift#healthcheck
+
 [account-replicator]
 rsync_module = {replication_ip}::account{replication_port}
 
diff --git a/doc/saio/swift/account-server/4.conf b/doc/saio/swift/account-server/4.conf
index 343bc43e6..b14c4f81a 100644
--- a/doc/saio/swift/account-server/4.conf
+++ b/doc/saio/swift/account-server/4.conf
@@ -11,7 +11,7 @@ recon_cache_path = /var/cache/swift4
 eventlet_debug = true
 
 [pipeline:main]
-pipeline = recon account-server
+pipeline = healthcheck recon account-server
 
 [app:account-server]
 use = egg:swift#account
@@ -19,6 +19,9 @@ use = egg:swift#account
 [filter:recon]
 use = egg:swift#recon
 
+[filter:healthcheck]
+use = egg:swift#healthcheck
+
 [account-replicator]
 rsync_module = {replication_ip}::account{replication_port}
 
diff --git a/doc/saio/swift/container-server/1.conf b/doc/saio/swift/container-server/1.conf
index e71a5b668..072594c92 100644
--- a/doc/saio/swift/container-server/1.conf
+++ b/doc/saio/swift/container-server/1.conf
@@ -11,7 +11,7 @@ recon_cache_path = /var/cache/swift
 eventlet_debug = true
 
 [pipeline:main]
-pipeline = recon container-server
+pipeline = healthcheck recon container-server
 
 [app:container-server]
 use = egg:swift#container
@@ -19,6 +19,9 @@ use = egg:swift#container
 [filter:recon]
 use = egg:swift#recon
 
+[filter:healthcheck]
+use = egg:swift#healthcheck
+
 [container-replicator]
 rsync_module = {replication_ip}::container{replication_port}
 
diff --git a/doc/saio/swift/container-server/2.conf b/doc/saio/swift/container-server/2.conf
index 86e58a9fd..78c3d206b 100644
--- a/doc/saio/swift/container-server/2.conf
+++ b/doc/saio/swift/container-server/2.conf
@@ -11,7 +11,7 @@ recon_cache_path = /var/cache/swift2
 eventlet_debug = true
 
 [pipeline:main]
-pipeline = recon container-server
+pipeline = healthcheck recon container-server
 
 [app:container-server]
 use = egg:swift#container
@@ -19,6 +19,9 @@ use = egg:swift#container
 [filter:recon]
 use = egg:swift#recon
 
+[filter:healthcheck]
+use = egg:swift#healthcheck
+
 [container-replicator]
 rsync_module = {replication_ip}::container{replication_port}
 
diff --git a/doc/saio/swift/container-server/3.conf b/doc/saio/swift/container-server/3.conf
index 73e760af1..d4de73a92 100644
--- a/doc/saio/swift/container-server/3.conf
+++ b/doc/saio/swift/container-server/3.conf
@@ -11,7 +11,7 @@ recon_cache_path = /var/cache/swift3
 eventlet_debug = true
 
 [pipeline:main]
-pipeline = recon container-server
+pipeline = healthcheck recon container-server
 
 [app:container-server]
 use = egg:swift#container
@@ -19,6 +19,9 @@ use = egg:swift#container
 [filter:recon]
 use = egg:swift#recon
 
+[filter:healthcheck]
+use = egg:swift#healthcheck
+
 [container-replicator]
 rsync_module = {replication_ip}::container{replication_port}
 
diff --git a/doc/saio/swift/container-server/4.conf b/doc/saio/swift/container-server/4.conf
index c254191b8..d644ff29e 100644
--- a/doc/saio/swift/container-server/4.conf
+++ b/doc/saio/swift/container-server/4.conf
@@ -11,7 +11,7 @@ recon_cache_path = /var/cache/swift4
 eventlet_debug = true
 
 [pipeline:main]
-pipeline = recon container-server
+pipeline = healthcheck recon container-server
 
 [app:container-server]
 use = egg:swift#container
@@ -19,6 +19,9 @@ use = egg:swift#container
 [filter:recon]
 use = egg:swift#recon
 
+[filter:healthcheck]
+use = egg:swift#healthcheck
+
 [container-replicator]
 rsync_module = {replication_ip}::container{replication_port}
 
diff --git a/doc/saio/swift/object-server/1.conf b/doc/saio/swift/object-server/1.conf
index c6d1b1464..243722394 100644
--- a/doc/saio/swift/object-server/1.conf
+++ b/doc/saio/swift/object-server/1.conf
@@ -11,7 +11,7 @@ recon_cache_path = /var/cache/swift
 eventlet_debug = true
 
 [pipeline:main]
-pipeline = recon object-server
+pipeline = healthcheck recon object-server
 
 [app:object-server]
 use = egg:swift#object
@@ -19,6 +19,9 @@ use = egg:swift#object
 [filter:recon]
 use = egg:swift#recon
 
+[filter:healthcheck]
+use = egg:swift#healthcheck
+
 [object-replicator]
 rsync_module = {replication_ip}::object{replication_port}
 
diff --git a/doc/saio/swift/object-server/2.conf b/doc/saio/swift/object-server/2.conf
index 8d99b0287..647afda41 100644
--- a/doc/saio/swift/object-server/2.conf
+++ b/doc/saio/swift/object-server/2.conf
@@ -11,7 +11,7 @@ recon_cache_path = /var/cache/swift2
 eventlet_debug = true
 
 [pipeline:main]
-pipeline = recon object-server
+pipeline = healthcheck recon object-server
 
 [app:object-server]
 use = egg:swift#object
@@ -19,6 +19,9 @@ use = egg:swift#object
 [filter:recon]
 use = egg:swift#recon
 
+[filter:healthcheck]
+use = egg:swift#healthcheck
+
 [object-replicator]
 rsync_module = {replication_ip}::object{replication_port}
 
diff --git a/doc/saio/swift/object-server/3.conf b/doc/saio/swift/object-server/3.conf
index fe6cef65a..563025761 100644
--- a/doc/saio/swift/object-server/3.conf
+++ b/doc/saio/swift/object-server/3.conf
@@ -11,7 +11,7 @@ recon_cache_path = /var/cache/swift3
 eventlet_debug = true
 
 [pipeline:main]
-pipeline = recon object-server
+pipeline = healthcheck recon object-server
 
 [app:object-server]
 use = egg:swift#object
@@ -19,6 +19,9 @@ use = egg:swift#object
 [filter:recon]
 use = egg:swift#recon
 
+[filter:healthcheck]
+use = egg:swift#healthcheck
+
 [object-replicator]
 rsync_module = {replication_ip}::object{replication_port}
 
diff --git a/doc/saio/swift/object-server/4.conf b/doc/saio/swift/object-server/4.conf
index 86ba2621e..0ab17690d 100644
--- a/doc/saio/swift/object-server/4.conf
+++ b/doc/saio/swift/object-server/4.conf
@@ -11,7 +11,7 @@ recon_cache_path = /var/cache/swift4
 eventlet_debug = true
 
 [pipeline:main]
-pipeline = recon object-server
+pipeline = healthcheck recon object-server
 
 [app:object-server]
 use = egg:swift#object
@@ -19,6 +19,9 @@ use = egg:swift#object
 [filter:recon]
 use = egg:swift#recon
 
+[filter:healthcheck]
+use = egg:swift#healthcheck
+
 [object-replicator]
 rsync_module = {replication_ip}::object{replication_port}
 
diff --git a/doc/saio/swift/proxy-server.conf b/doc/saio/swift/proxy-server.conf
index 869eff871..5dcf1e4eb 100644
--- a/doc/saio/swift/proxy-server.conf
+++ b/doc/saio/swift/proxy-server.conf
@@ -77,6 +77,20 @@ use = egg:swift#listing_formats
 [filter:symlink]
 use = egg:swift#symlink
 
+# To enable, add the s3api middleware to the pipeline before tempauth
+[filter:s3api]
+use = egg:swift#s3api
+
+# Example to create root secret: `openssl rand -base64 32`
+[filter:keymaster]
+use = egg:swift#keymaster
+encryption_root_secret = changeme/changeme/changeme/changeme/change/=
+
+# To enable use of encryption add both middlewares to pipeline, example:
+# <other middleware> keymaster encryption proxy-logging proxy-server
+[filter:encryption]
+use = egg:swift#encryption
+
 [app:proxy-server]
 use = egg:swift#proxy
 allow_account_management = true