openstack/swift
Code Issues Proposed changes

Merge "Allow to specify auth_version in swift-dispersion tools"

Browse Source
This commit is contained in:
Jenkins 2012-04-02 23:47:50 +00:00 committed by Gerrit Code Review
commit 848b3f0544
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/swift-dispersion-populate
View File

@ -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'],

2
bin/swift-dispersion-report
View File

@ -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'],

5
etc/dispersion.conf-sample
View File

@ -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