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

Author: Jenkins

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

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

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