From ebc5e4ee46dce9ab17208cdebc31ae5cc8c7e828 Mon Sep 17 00:00:00 2001 From: Loic Dachary Date: Thu, 22 Oct 2015 01:48:31 +0200 Subject: [PATCH] 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 (cherry picked from commit 163de5b0f8f46695ab41b3f2288e9b5c1feaedab) --- qa/workunits/ceph-disk/ceph-disk.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/qa/workunits/ceph-disk/ceph-disk.sh b/qa/workunits/ceph-disk/ceph-disk.sh index 69bf525baa6de..044517db8615d 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 -- 2.47.3