ceph.conf: use default locations for admin socket; fix client log file

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

diff --git a/teuthology/ceph.conf.template b/teuthology/ceph.conf.template
index 192b2313f1d165bcc4f6bf0f8bab814c84be20ec..aacec7902dee4f518124bef17b4d3fff728a027b 100644 (file)
--- a/teuthology/ceph.conf.template
+++ b/teuthology/ceph.conf.template
@@ -2,7 +2,6 @@
        chdir = ""
        pid file = $name.pid
         auth supported = cephx
-       admin socket = {testdir}/asok.$name
 
        filestore xattr use omap = true
 
@@ -30,4 +29,5 @@
         rgw cache enabled = true
        rgw enable ops log = true
        rgw enable usage log = true
-       log dir = /var/log/ceph/ceph.$name.$pid.log
\ No newline at end of file
+       log dir = /var/log/ceph/ceph-$name.$pid.log
+       admin socket = /var/run/ceph/ceph-$name.$pid.asok

diff --git a/teuthology/task/admin_socket.py b/teuthology/task/admin_socket.py
index 86d0bf20dcc862ea3aaee27e1435a9d3bdc9fdb2..85d0b2a6cae2a29c82526e057b7b844bec359cf2 100644 (file)
--- a/teuthology/task/admin_socket.py
+++ b/teuthology/task/admin_socket.py
@@ -89,7 +89,7 @@ def _run_tests(ctx, client, tests):
     testdir = teuthology.get_testdir(ctx)
     log.debug('Running admin socket tests on %s', client)
     (remote,) = ctx.cluster.only(client).remotes.iterkeys()
-    socket_path = '{tdir}/asok.{name}'.format(tdir=testdir, name=client)
+    socket_path = '/var/run/ceph/ceph-{name}.asok'.format(name=client)
 
     try:
         tmp_dir = os.path.join(

diff --git a/teuthology/task/ceph.py b/teuthology/task/ceph.py
index 382d7b706c5d1f32cbc9d29f4a147fa6a154be95..4fdca4528486c7862ca2690f0ff628589e77c01c 100644 (file)
--- a/teuthology/task/ceph.py
+++ b/teuthology/task/ceph.py
@@ -816,7 +816,6 @@ def cluster(ctx, config):
                     keyring_path,
                     '{tdir}/data'.format(tdir=testdir),
                     '{tdir}/monmap'.format(tdir=testdir),
-                    run.Raw('{tdir}/asok.*'.format(tdir=testdir))
                     ],
                 wait=False,
                 ),

diff --git a/teuthology/task/ceph_manager.py b/teuthology/task/ceph_manager.py
index 8a272285367486b162f8f3feaf7500719909ec7b..4d109c32e4215038df393121338483f8531f7dd9 100644 (file)
--- a/teuthology/task/ceph_manager.py
+++ b/teuthology/task/ceph_manager.py
@@ -275,7 +275,7 @@ class CephManager:
             '{tdir}/archive/coverage'.format(tdir=testdir),
             'ceph',
             '--admin-daemon',
-            "%s/asok.osd.%s"%(testdir,str(osdnum),)]
+            "/var/run/ceph/ceph-osd.%s.asok"%(testdir,str(osdnum),)]
         args.extend(command)
         return remote.run(
             args=args,