]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
qa/workunits/cephadm/test_cephadm.sh: skip docker when service is disabled 33018/head
authorMichael Fritch <mfritch@suse.com>
Fri, 31 Jan 2020 17:27:07 +0000 (10:27 -0700)
committerMichael Fritch <mfritch@suse.com>
Fri, 31 Jan 2020 17:27:07 +0000 (10:27 -0700)
Signed-off-by: Michael Fritch <mfritch@suse.com>
qa/workunits/cephadm/test_cephadm.sh

index ba1af1340613f6502bc0de7fedabcee2278108e1..9ecb9734f99d6ed454de5811773954cbd10ea122 100755 (executable)
@@ -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'