From 69e7424d3cb6c59341d739c3d41f42397031d96a Mon Sep 17 00:00:00 2001 From: Eran Rom Date: Tue, 28 Jul 2015 09:41:12 +0300 Subject: [PATCH] Add container sync probe test to SAIO default set SAIO Configuration and documentation changes enabling to run the container sync probe test by default Change-Id: Iccf59533d0d4fe72549d318339ab125d04dde006 Related-Bug: #1476623 --- doc/saio/swift/container-sync-realms.conf | 5 +++++ doc/saio/swift/proxy-server.conf | 6 +++++- doc/source/development_saio.rst | 4 ++++ 3 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 doc/saio/swift/container-sync-realms.conf diff --git a/doc/saio/swift/container-sync-realms.conf b/doc/saio/swift/container-sync-realms.conf new file mode 100644 index 0000000000..503a71c4f1 --- /dev/null +++ b/doc/saio/swift/container-sync-realms.conf @@ -0,0 +1,5 @@ +[saio] +key = changeme +key2 = changeme +cluster_saio_endpoint = http://127.0.0.1:8080/v1/ + diff --git a/doc/saio/swift/proxy-server.conf b/doc/saio/swift/proxy-server.conf index c25e0ed90d..d9e5c95148 100644 --- a/doc/saio/swift/proxy-server.conf +++ b/doc/saio/swift/proxy-server.conf @@ -9,7 +9,7 @@ eventlet_debug = true [pipeline:main] # Yes, proxy-logging appears twice. This is so that # middleware-originated requests get logged too. -pipeline = catch_errors gatekeeper healthcheck proxy-logging cache bulk tempurl ratelimit crossdomain tempauth staticweb container-quotas account-quotas slo dlo versioned_writes proxy-logging proxy-server +pipeline = catch_errors gatekeeper healthcheck proxy-logging cache bulk tempurl ratelimit crossdomain container_sync tempauth staticweb container-quotas account-quotas slo dlo versioned_writes proxy-logging proxy-server [filter:catch_errors] use = egg:swift#catch_errors @@ -35,6 +35,10 @@ use = egg:swift#dlo [filter:slo] use = egg:swift#slo +[filter:container_sync] +use = egg:swift#container_sync +current = //saio/saio_endpoint + [filter:tempurl] use = egg:swift#tempurl diff --git a/doc/source/development_saio.rst b/doc/source/development_saio.rst index e406fb02ef..0f391266ce 100644 --- a/doc/source/development_saio.rst +++ b/doc/source/development_saio.rst @@ -371,6 +371,10 @@ commands are as follows: .. literalinclude:: /../saio/swift/container-reconciler.conf + #. ``/etc/swift/container-sync-realms.conf`` + + .. literalinclude:: /../saio/swift/container-sync-realms.conf + #. ``/etc/swift/account-server/1.conf`` .. literalinclude:: /../saio/swift/account-server/1.conf