From 9a423d0b78a105caf6011c6c3450f7d75d20b5a1 Mon Sep 17 00:00:00 2001 From: Julien Danjou Date: Mon, 2 Apr 2012 16:41:16 +0200 Subject: [PATCH] Allow to specify auth_version in swift-dispersion tools Change-Id: I080d531471d8ea57c69a918d4f6930441f1e69f6 Signed-off-by: Julien Danjou --- bin/swift-dispersion-populate | 2 +- bin/swift-dispersion-report | 2 +- etc/dispersion.conf-sample | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/bin/swift-dispersion-populate b/bin/swift-dispersion-populate index c5c2cd6976..6e8d3ed339 100755 --- a/bin/swift-dispersion-populate +++ b/bin/swift-dispersion-populate @@ -96,7 +96,7 @@ if __name__ == '__main__': retries_done = 0 url, token = get_auth(conf['auth_url'], conf['auth_user'], - conf['auth_key']) + conf['auth_key'], auth_version=conf.get('auth_version', '1.0')) account = url.rsplit('/', 1)[1] connpool = Pool(max_size=concurrency) connpool.create = lambda: Connection(conf['auth_url'], diff --git a/bin/swift-dispersion-report b/bin/swift-dispersion-report index a6d4943d84..e4823170fb 100755 --- a/bin/swift-dispersion-report +++ b/bin/swift-dispersion-report @@ -281,7 +281,7 @@ Usage: %prog [options] [conf_file] coropool = GreenPool(size=concurrency) url, token = get_auth(conf['auth_url'], conf['auth_user'], - conf['auth_key']) + conf['auth_key'], auth_version=conf.get('auth_version', '1.0')) account = url.rsplit('/', 1)[1] connpool = Pool(max_size=concurrency) connpool.create = lambda: Connection(conf['auth_url'], diff --git a/etc/dispersion.conf-sample b/etc/dispersion.conf-sample index cf1a2624db..f153b6e2f5 100644 --- a/etc/dispersion.conf-sample +++ b/etc/dispersion.conf-sample @@ -2,6 +2,11 @@ auth_url = http://saio:8080/auth/v1.0 auth_user = test:tester auth_key = testing +# auth_url = http://saio:5000/v2.0/ +# auth_user = test:tester +# auth_key = testing +# auth_version = 2.0 +# # swift_dir = /etc/swift # dispersion_coverage = 1 # retries = 5