]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
mgr/cephadm: pass --container-init to `cephadm deploy` if specified 42666/head
authorTim Serong <tserong@suse.com>
Thu, 5 Aug 2021 08:48:57 +0000 (18:48 +1000)
committerTim Serong <tserong@suse.com>
Wed, 11 Aug 2021 04:49:10 +0000 (14:49 +1000)
commit1c905dfcd53707c7641d781ed91ffb4971f7a5b8
tree730537d821323d495447c828f88673f9caf2fb6d
parentb1a6ca267fbb97335fca9289f85e1a47d253e5a2
mgr/cephadm: pass --container-init to `cephadm deploy` if specified

This (sort of) reverts a small part of 442904bf2da, in order to
work correctly with 82d30afc413.  The problem is that the latter
commit sets CONTAINER_INIT=False, which means we need to explicitly
pass --container-init to cephadm if we want that behaviour turned on.
There's a kink though: --container-init is only valid with cephadm's
"adopt", "bootstrap" and "deploy" commands; it's not a global option.
The cephadm mgr module doesn't invoke "adopt" or "bootstrap", only
"deploy", so we're only setting it in that specific case.

Fixes: https://tracker.ceph.com/issues/52064
Signed-off-by: Tim Serong <tserong@suse.com>
src/pybind/mgr/cephadm/module.py