rgw: fix whitespace

Replace tabs with spaces and remove trailing spaces.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>

diff --git a/teuthology/task/radosgw-agent.py b/teuthology/task/radosgw-agent.py
index d996af021d3f49e7492a591542adba79d80338e6..f13777dc14003ff086df3055d31cc5f75dc39607 100644 (file)
--- a/teuthology/task/radosgw-agent.py
+++ b/teuthology/task/radosgw-agent.py
@@ -39,7 +39,7 @@ def run_radosgw_agent(ctx, config):
         remote.run(
             args=[
                 'cd', testdir, run.Raw('&&'),
-                'git', 'clone', 
+                'git', 'clone',
                 '-b', branch,
                 'https://github.com/ceph/radosgw-agent.git',
                 'radosgw-agent.{client}'.format(client=client),
@@ -74,25 +74,25 @@ def run_radosgw_agent(ctx, config):
         port = cconf.get('port', 8000)
         daemon_name = '{host}.{port}.syncdaemon'.format(host=remote.name, port=port)
         in_args=[
-                       'daemon-helper',
-                       'kill',
-                       '{tdir}/radosgw-agent.{client}/radosgw-agent'.format(tdir=testdir,
-                                                                            client=client),
-                       '-v',
-                       '--src-access-key', src_access,
-                       '--src-secret-key', src_secret,
-                       '--source', "http://{addr}:{port}".format(addr=src_host, port=src_port),
-                       '--dest-access-key', dest_access,
-                       '--dest-secret-key', dest_secret,
-                       '--log-file', '{tdir}/archive/rgw_sync_agent.{client}.log'.format(
-                           tdir=testdir,
-                           client=client),
-                       "http://{addr}:{port}".format(addr=dest_host, port=dest_port),
-                       ]
+            'daemon-helper',
+            'kill',
+            '{tdir}/radosgw-agent.{client}/radosgw-agent'.format(tdir=testdir,
+                                                                 client=client),
+            '-v',
+            '--src-access-key', src_access,
+            '--src-secret-key', src_secret,
+            '--source', "http://{addr}:{port}".format(addr=src_host, port=src_port),
+            '--dest-access-key', dest_access,
+            '--dest-secret-key', dest_secret,
+            '--log-file', '{tdir}/archive/rgw_sync_agent.{client}.log'.format(
+                tdir=testdir,
+                client=client),
+            "http://{addr}:{port}".format(addr=dest_host, port=dest_port),
+            ]
         # the test server and full/incremental flags are mutually exclusive
         if sync_scope is None:
             in_args.append('--test-server-host')
-            in_args.append('0.0.0.0') 
+            in_args.append('0.0.0.0')
             in_args.append('--test-server-port')
             in_args.append(str(port))
             log.debug('Starting a sync test server on {client}'.format(client=client))
@@ -105,10 +105,10 @@ def run_radosgw_agent(ctx, config):
 
         return_list.append((client, remote.run(
             args=in_args,
-                       wait=False,
-                       stdin=run.PIPE,
-                       logger=log.getChild(daemon_name),
-                       )))
+            wait=False,
+            stdin=run.PIPE,
+            logger=log.getChild(daemon_name),
+            )))
     return return_list
 
 
@@ -122,15 +122,15 @@ def task(ctx, config):
     to 0.0.0.0. Port defaults to 8000. This must be run on clients
     that have the correct zone root pools and rgw zone set in
     ceph.conf, or the task cannot read the region information from the
-    cluster. 
+    cluster.
 
     By default, this task will start an HTTP server that will trigger full
-    or incremental syncs based on requests made to it. 
+    or incremental syncs based on requests made to it.
     Alternatively, a single full sync can be triggered by
     specifying 'sync-scope: full' or a loop of incremental syncs can be triggered
     by specifying 'sync-scope: incremental' (the loop will sleep
     '--incremental-sync-delay' seconds between each sync, default is 20 seconds).
-    
+
     An example::
 
       tasks:

diff --git a/teuthology/task_util/rgw.py b/teuthology/task_util/rgw.py
index 7b3ba47565321f2335805ca4ae1a9a81cc5602be..d534f1f47fbff47ee2486c8879372f9e92a31acd 100644 (file)
--- a/teuthology/task_util/rgw.py
+++ b/teuthology/task_util/rgw.py
@@ -129,7 +129,7 @@ def radosgw_agent_sync_all(ctx, full=False, data=False):
             sync_host, sync_port = get_sync_agent(ctx, agent_client)
             log.debug('doing a sync via {host1}'.format(host1=sync_host))
             radosgw_agent_sync_metadata(ctx, sync_host, sync_port, full)
-           if (data):
+            if (data):
                 radosgw_agent_sync_data(ctx, sync_host, sync_port, full)
 
 def host_for_role(ctx, role):