From: Sage Weil <sage@newdream.net>
Date: Wed, 27 Jan 2021 03:46:09 +0000 (-0600)
Subject: qa/workunits/cephadm/test_cephadm: behave on terminal
X-Git-Tag: v17.1.0~3118^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c82770f77c77a14334dab668a1e0e2c992974849;p=ceph.git

qa/workunits/cephadm/test_cephadm: behave on terminal

Signed-off-by: Sage Weil <sage@newdream.net>
---

diff --git a/qa/workunits/cephadm/test_cephadm.sh b/qa/workunits/cephadm/test_cephadm.sh
index 0650f9461ef..6f1e1985643 100755
--- a/qa/workunits/cephadm/test_cephadm.sh
+++ b/qa/workunits/cephadm/test_cephadm.sh
@@ -154,7 +154,7 @@ $SUDO CEPHADM_IMAGE=$IMAGE_OCTOPUS $CEPHADM_BIN version \
 $SUDO $CEPHADM_BIN --image $IMAGE_MASTER version | grep 'ceph version'
 
 # try force docker; this won't work if docker isn't installed
-systemctl status docker && ( $CEPHADM --docker version | grep 'ceph version' )
+systemctl status docker > /dev/null && ( $CEPHADM --docker version | grep 'ceph version' ) || echo "docker not installed"
 
 ## test shell before bootstrap, when crash dir isn't (yet) present on this host
 $CEPHADM shell --fsid $FSID -- ceph -v | grep 'ceph version'