s3roundtrip, s3readwrite: access key uses url safe chars

Signed-off-by: Yehuda Sadeh <yehuda.sadeh@dreamhost.com>

diff --git a/teuthology/task/s3readwrite.py b/teuthology/task/s3readwrite.py
index 3739bf04bb233782117fcdf25076e23b8acdc7d7..658799413b920171a3bb59648b2a68433c1d3c4c 100644 (file)
--- a/teuthology/task/s3readwrite.py
+++ b/teuthology/task/s3readwrite.py
@@ -4,6 +4,7 @@ import contextlib
 import logging
 import os
 import yaml
+import random
 
 from teuthology import misc as teuthology
 from teuthology import contextutil
@@ -43,7 +44,7 @@ def _config_user(s3tests_conf, section, user):
     s3tests_conf[section].setdefault('user_id', user)
     s3tests_conf[section].setdefault('email', '{user}+test@test.test'.format(user=user))
     s3tests_conf[section].setdefault('display_name', 'Mr. {user}'.format(user=user))
-    s3tests_conf[section].setdefault('access_key', base64.b64encode(os.urandom(20)))
+    s3tests_conf[section].setdefault('access_key', ''.join(random.choice(string.uppercase) for i in xrange(20)))
     s3tests_conf[section].setdefault('secret_key', base64.b64encode(os.urandom(40)))
 
 @contextlib.contextmanager

diff --git a/teuthology/task/s3roundtrip.py b/teuthology/task/s3roundtrip.py
index 32c666b7df132df84e22eab9d85ea1df6d4bf46a..15cf4fbe2100bee3a44460d75d8c191ff0bb3af8 100644 (file)
--- a/teuthology/task/s3roundtrip.py
+++ b/teuthology/task/s3roundtrip.py
@@ -4,6 +4,7 @@ import contextlib
 import logging
 import os
 import yaml
+import random
 
 from teuthology import misc as teuthology
 from teuthology import contextutil
@@ -43,7 +44,7 @@ def _config_user(s3tests_conf, section, user):
     s3tests_conf[section].setdefault('user_id', user)
     s3tests_conf[section].setdefault('email', '{user}+test@test.test'.format(user=user))
     s3tests_conf[section].setdefault('display_name', 'Mr. {user}'.format(user=user))
-    s3tests_conf[section].setdefault('access_key', base64.b64encode(os.urandom(20)))
+    s3tests_conf[section].setdefault('access_key', ''.join(random.choice(string.uppercase) for i in xrange(20)))
     s3tests_conf[section].setdefault('secret_key', base64.b64encode(os.urandom(40)))
 
 @contextlib.contextmanager