rename variables and log messages to be more clear

A few edits to make logging and variable names
more clear.

Signed-off-by: Joe Buck <jbbuck@gmail.com>

diff --git a/teuthology/task/radosgw-admin.py b/teuthology/task/radosgw-admin.py
index 630e197019532c8d52ed9afa1875cb2c0395c438..2d68148f7069508c35ad9f58f9fe388f48d0df00 100644 (file)
--- a/teuthology/task/radosgw-admin.py
+++ b/teuthology/task/radosgw-admin.py
@@ -32,7 +32,7 @@ def successful_ops(out):
 
 # simple test to indicate if multi-region testing should occur
 def multi_region_enabled(ctx):
-    # this is populated by the radosgw_agent task, seems reasonable to use that as an indicator that
+    # this is populated by the radosgw-agent task, seems reasonable to use that as an indicator that
     # we're testing multi-region sync 
     return 'radosgw_agent' in ctx
 

diff --git a/teuthology/task_util/rgw.py b/teuthology/task_util/rgw.py
index 153708abe575368090d49a3b891394e8df10d231..91458e5cbb13d2912e1f3aa0accb5ae194d9fb3d 100644 (file)
--- a/teuthology/task_util/rgw.py
+++ b/teuthology/task_util/rgw.py
@@ -10,7 +10,7 @@ from teuthology import misc as teuthology
 log = logging.getLogger(__name__)
 
 def rgwadmin(ctx, client, cmd, stdin=StringIO(), check_status=False):
-    log.info('rgwadmin: %s' % cmd)
+    log.info('rgwadmin: {client} : {cmd}'.format(client=client,cmd=cmd))
     testdir = teuthology.get_testdir(ctx)
     pre = [
         '{tdir}/adjust-ulimits'.format(tdir=testdir),