From: Michael Fritch <mfritch@suse.com>
Date: Fri, 31 Jan 2020 17:27:07 +0000 (-0700)
Subject: qa/workunits/cephadm/test_cephadm.sh: skip docker when service is disabled
X-Git-Tag: v15.1.1~542^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F33018%2Fhead;p=ceph.git

qa/workunits/cephadm/test_cephadm.sh: skip docker when service is disabled

Signed-off-by: Michael Fritch <mfritch@suse.com>
---

diff --git a/qa/workunits/cephadm/test_cephadm.sh b/qa/workunits/cephadm/test_cephadm.sh
index ba1af1340613..9ecb9734f99d 100755
--- a/qa/workunits/cephadm/test_cephadm.sh
+++ b/qa/workunits/cephadm/test_cephadm.sh
@@ -102,7 +102,7 @@ $SUDO $CEPHADM_BIN --image $IMAGE_MIMIC version \
 $SUDO $CEPHADM_BIN --image $IMAGE_MASTER version | grep 'ceph version'
 
 # try force docker; this won't work if docker isn't installed
-which docker && ( $CEPHADM --docker version | grep 'ceph version' )
+systemctl status docker && ( $CEPHADM --docker version | grep 'ceph version' )
 
 ## test shell before bootstrap, when crash dir isn't (yet) present on this host
 $CEPHADM shell --fsid $FSID -- ceph -v | grep 'ceph version'