]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
projects / ceph-ci.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 12a0faa) | patch
cephadm: fix ceph version probe
authorSage Weil <sage@redhat.com>
Sat, 8 Feb 2020 17:32:58 +0000 (11:32 -0600)
committerSage Weil <sage@redhat.com>
Sun, 9 Feb 2020 20:00:50 +0000 (14:00 -0600)
commita7d5d5cc8c546e7a79fd4af005c3d47ae2ee5ffa
tree88ec8fe09d019ff9521fe3530706de5056963a17tree | snapshot
parent12a0faa9fa0fbef02e72fd852e7bfe5dfbbbc12ccommit | diff
cephadm: fix ceph version probe

docker returns '<no value>' if the label isn't present, in which case we
still need to run ceph -v.

Also, don't probe non-ceph (e.g., monitoring) containers.

Also, only probe each image id once.

Add a simple test.

Signed-off-by: Sage Weil <sage@redhat.com>
qa/workunits/cephadm/test_cephadm.sh diff | blob | history
src/cephadm/cephadm diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.