avoid secretfile, except for kclient

Only mount.ceph needs the secret in a standalone file.  Remove other users,
and simplify that one.

Signed-off-by: Sage Weil <sage@inktank.com>

diff --git a/teuthology/misc.py b/teuthology/misc.py
index 9d5918e97365c7305c3ac02b84138883ef26fdee..1671d3673603650baa276cff163be5bd7bedb6ef 100644 (file)
--- a/teuthology/misc.py
+++ b/teuthology/misc.py
@@ -541,11 +541,8 @@ def reconnect(ctx, timeout):
         log.debug('waited {elapsed}'.format(elapsed=str(time.time() - starttime)))
         time.sleep(1)
 
-def write_secret_file(ctx, remote, role, filename):
+def write_secret_file(ctx, remote, role, keyring, filename):
     testdir = get_testdir(ctx)
-    keyring = '{tdir}/data/{role}.keyring'.format(tdir=testdir, role=role)
-    if role.startswith('client.'):
-        keyring = '/etc/ceph/ceph.{role}.keyring'.format(role=role)
     remote.run(
         args=[
             '{tdir}/enable-coredump'.format(tdir=testdir),

diff --git a/teuthology/task/kclient.py b/teuthology/task/kclient.py
index 26c69f8e58951ef46b0b01eab64d5802d39f083d..6cf0f5d86fe1fab4ccaa1c385e6e0b0f7dfc7179 100644 (file)
--- a/teuthology/task/kclient.py
+++ b/teuthology/task/kclient.py
@@ -53,8 +53,10 @@ def task(ctx, config):
         ips = [host for (host, port) in (remote_.ssh.get_transport().getpeername() for (remote_, roles) in remotes_and_roles)]
         mons = teuthology.get_mons(roles, ips).values()
 
+        keyring = '/etc/ceph/ceph.client.{id}.keyring'.format(id=id_)
         secret = '{tdir}/data/client.{id}.secret'.format(tdir=testdir, id=id_)
-        teuthology.write_secret_file(ctx, remote, 'client.{id}'.format(id=id_), secret)
+        teuthology.write_secret_file(ctx, remote, 'client.{id}'.format(id=id_),
+                                     keyring, secret)
 
         remote.run(
             args=[

diff --git a/teuthology/task/rbd.py b/teuthology/task/rbd.py
index 3e63a7a279b4746dc7df8e51654c4385cb56269a..febe96a74e0a75863d02e2807bfc3e3f4b5833dc 100644 (file)
--- a/teuthology/task/rbd.py
+++ b/teuthology/task/rbd.py
@@ -181,9 +181,6 @@ def dev_create(ctx, config):
                 ],
             )
 
-        secretfile = '{tdir}/data/{role}.secret'.format(tdir=testdir, role=role)
-        teuthology.write_secret_file(ctx, remote, role, secretfile)
-
         remote.run(
             args=[
                 'sudo',
@@ -192,7 +189,6 @@ def dev_create(ctx, config):
                 '{tdir}/archive/coverage'.format(tdir=testdir),
                 'rbd',
                 '--user', role.rsplit('.')[-1],
-                '--secret', secretfile,
                 '-p', 'rbd',
                 'map',
                 image,

diff --git a/teuthology/task/workunit.py b/teuthology/task/workunit.py
index f96fc52b159e61a5d0d27aef943aeadc6c93ee41..21aa2de9caf5d3bb7c874a5a80449b4d2aaa7eac 100644 (file)
--- a/teuthology/task/workunit.py
+++ b/teuthology/task/workunit.py
@@ -226,8 +226,6 @@ def _run_tests(ctx, refspec, role, tests, env, subdir=None):
     else:
         scratch_tmp = os.path.join(mnt, subdir)
     srcdir = '{tdir}/workunit.{role}'.format(tdir=testdir, role=role)
-    secretfile = '{tdir}/data/{role}.secret'.format(tdir=testdir, role=role)
-    teuthology.write_secret_file(ctx, remote, role, secretfile)
 
     ceph_ref = ctx.summary.get('ceph-sha1', 'master')
 
@@ -277,7 +275,6 @@ def _run_tests(ctx, refspec, role, tests, env, subdir=None):
                     run.Raw('&&'),
                     run.Raw('CEPH_REF={ref}'.format(ref=ceph_ref)),
                     run.Raw('CEPH_JAVA_PATH="{tdir}/binary/usr/local/share/java"'.format(tdir=testdir)),
-                    run.Raw('CEPH_SECRET_FILE="{file}"'.format(file=secretfile)),
                     run.Raw('CEPH_ID="{id}"'.format(id=id_)),
                     run.Raw('PYTHONPATH="$PYTHONPATH:{tdir}/binary/usr/local/lib/python2.7/dist-packages:{tdir}/binary/usr/local/lib/python2.6/dist-packages"'.format(tdir=testdir)),
                     ]