]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
mgr/cephadm: try again calling ceph-volume without --filter-for-batch 39300/head
authorSebastian Wagner <sebastian.wagner@suse.com>
Fri, 15 Jan 2021 12:13:35 +0000 (13:13 +0100)
committerSebastian Wagner <sebastian.wagner@suse.com>
Thu, 4 Feb 2021 14:20:22 +0000 (15:20 +0100)
commit2925d71e8eed91424f4b0ba970e7fcdac15d4fbc
tree4b4d69ada5da83d0050872090fba153294393134
parent9fd340b339fa894d93a5b1fd59cdbecbcf48dc56
mgr/cephadm: try again calling ceph-volume without --filter-for-batch

Fixes: https://tracker.ceph.com/issues/48870
This deals with a cephadm upgrade issue:

1. user calls `ceph orch upgrade`
2. mgr/cephadm calls `ceph orch config set mgr.x container_image <new-container>`
3. standby mgr gets upgraded
4. mgr failover to new mgr
5. mgr/cephadm calls `_refresh_host_devices`
6. `_refresh_host_devices` calls` ceph orch config get osd container_image`.
  But this returns the old image
7. `_refresh_host_devices` calls `ceph-volume ... --filter-for-batch`
  with an image that doesn't support `filter-for-batch`

The idea is to simply retiry calling ceph-volume inventory without `--filter-for-batch`

(also removed `out` being used without being declared)

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit ede3d6d147dd7b99d37aee5c5fb9340f2878db18)

Conflicts:
  src/pybind/mgr/cephadm/tests/test_cephadm.py
src/pybind/mgr/cephadm/serve.py
src/pybind/mgr/cephadm/tests/test_cephadm.py