]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
cephadm: only bootstrap using image that matches cephadm version
authorSage Weil <sage@newdream.net>
Wed, 24 Mar 2021 03:00:46 +0000 (22:00 -0500)
committerSage Weil <sage@newdream.net>
Wed, 24 Mar 2021 03:00:46 +0000 (22:00 -0500)
commite920bef68db0bd35cb446af7979d0b8346eeccf4
tree537562a8f513dda1e2f312ca75a794a51cdcdfed
parent62415e7114b56d6f4234f25c902dec2bc9f25b4b
cephadm: only bootstrap using image that matches cephadm version

Only allow bootstrap to deploy if the cephadm version matches the
ceph version in the container.  Allow the master branch version of cephadm
to deploy the latest stable version as well (at least for now).

Provide a flag to force bootstrap to continue despite the check.

Move the _pull_image call up into bootstrap so that it is easier to see
when it happens.

Fixes: https://tracker.ceph.com/issues/49884
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 1b5a068ddfc84002cefb384ea01e97b5300408a1)

# Conflicts:
# src/cephadm/cephadm
 - default images are diff for pacific branch
src/cephadm/cephadm