]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: fcb8dfa) | 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>
Wed, 17 Mar 2021 21:24:32 +0000 (16:24 -0500)
commit456608579d6482170bdffab37142cf15b56b54c0
tree91282eed45e5a007ee0fa9249c21add26a8d9c33tree | snapshot
parentfcb8dfa0fab2a11bd61f946297214bd3f143c335commit | 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>
(cherry picked from commit 91490385d61b37c2e463e3d80dd873724f55d63a)
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.