RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-20 09:16:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #33018 from mgfritch/cephadm-docker-disabled

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

Reviewed-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Kefu Chai 2020-02-05 20:46:16 +08:00 committed by GitHub
commit 22da7813ef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qa/workunits/cephadm/test_cephadm.sh
View File

@ -105,7 +105,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'