]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
projects / ceph-ci.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: ee9399a) | patch
mgr/cephadm: fix redeploy when daemons have ip:port
authorSage Weil <sage@newdream.net>
Mon, 15 Mar 2021 19:34:13 +0000 (15:34 -0400)
committerSage Weil <sage@newdream.net>
Mon, 15 Mar 2021 22:55:26 +0000 (18:55 -0400)
commit91490385d61b37c2e463e3d80dd873724f55d63a
treed264c19b0227c1fa5e116a4f782a60d9b18cbfc9tree | snapshot
parentee9399a1395ec05d0392ddda1bce5595e07b3f2acommit | diff
mgr/cephadm: fix redeploy when daemons have ip:port

The _daemon_action() method can be called directly by upgrade and by
the 'orch daemon <action> <name>' commands.  When this happens, construct
a CephadmDaemonDeploySpec from the DaemonDescription that incldes the
metadata we assigned when teh service was created: the IP and port(s).
This fixes upgrade and the CLI.

Signed-off-by: Sage Weil <sage@newdream.net>
src/pybind/mgr/cephadm/module.py diff | blob | history
src/pybind/mgr/cephadm/serve.py diff | blob | history
src/pybind/mgr/cephadm/services/cephadmservice.py diff | blob | history
src/pybind/mgr/cephadm/upgrade.py diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.