From 7c0f7c23c789565d7ab9134e23d561f698174bd8 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Tue, 26 Jul 2011 21:52:39 -0700
Subject: [PATCH] specify and clean up admin socket

---
 teuthology/ceph.conf    | 1 +
 teuthology/task/ceph.py | 1 +
 2 files changed, 2 insertions(+)

diff --git a/teuthology/ceph.conf b/teuthology/ceph.conf
index 4e7616d0cb3a4..ebdd4c94bca49 100644
--- a/teuthology/ceph.conf
+++ b/teuthology/ceph.conf
@@ -6,6 +6,7 @@
 	chdir = ""
 	pid file = $name.pid
         auth supported = cephx
+	admin socket = /tmp/cephtest/asok.$name
 
 [mon]
         lockdep = 1
diff --git a/teuthology/task/ceph.py b/teuthology/task/ceph.py
index 08f18097c6612..2305fe6728e2c 100644
--- a/teuthology/task/ceph.py
+++ b/teuthology/task/ceph.py
@@ -507,6 +507,7 @@ def cluster(ctx, config):
                     '/tmp/cephtest/ceph.keyring',
                     '/tmp/cephtest/data',
                     '/tmp/cephtest/monmap',
+                    run.Raw('/tmp/cephtest/asok.*')
                     ],
                 wait=False,
                 ),
-- 
2.39.5