From: Loic Dachary <ldachary@redhat.com>
Date: Wed, 21 Oct 2015 23:48:31 +0000 (+0200)
Subject: tests: ceph-disk workunit uses the ceph task
X-Git-Tag: v10.0.0~71^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=163de5b0f8f46695ab41b3f2288e9b5c1feaedab;p=ceph.git

tests: ceph-disk workunit uses the ceph task

The ceph-disk workunit deploy keys that are not deployed by default by
the ceph teuthology task.

The OSD created by the ceph task are removed from the default
bucket (via osd rm) so they do not interfere with the tests.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
---

diff --git a/qa/workunits/ceph-disk/ceph-disk.sh b/qa/workunits/ceph-disk/ceph-disk.sh
index 69bf525baa6d..044517db8615 100755
--- a/qa/workunits/ceph-disk/ceph-disk.sh
+++ b/qa/workunits/ceph-disk/ceph-disk.sh
@@ -9,6 +9,17 @@ fi
 install python-pytest || true
 install pytest || true
 
+# complete the cluster setup done by the teuthology ceph task
+sudo chown $(id -u) /etc/ceph/ceph.conf
+if ! test -f /etc/ceph/ceph.client.admin.keyring ; then
+    sudo cp /etc/ceph/ceph.keyring /etc/ceph/ceph.client.admin.keyring
+fi
+if ! sudo test -f /var/lib/ceph/bootstrap-osd/ceph.keyring ; then
+    sudo ceph-create-keys --id a
+fi
+sudo ceph osd crush rm osd.0 || true
+sudo ceph osd crush rm osd.1 || true
+
 PATH=$(dirname $0)/..:$PATH
 
 if ! which py.test > /dev/null; then