]> 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: 4566085) | patch
mgr/cephadm: fall back to service spec port if none on DaemonDescription
authorSage Weil <sage@newdream.net>
Mon, 15 Mar 2021 22:58:15 +0000 (18:58 -0400)
committerSage Weil <sage@newdream.net>
Wed, 17 Mar 2021 21:24:43 +0000 (16:24 -0500)
commit6bb4f3495368f71fcdb9d745d2a197970ccfdf8b
tree113313bf768f3d2416fb4a757a20e5e2791efa74tree | snapshot
parent456608579d6482170bdffab37142cf15b56b54c0commit | diff
mgr/cephadm: fall back to service spec port if none on DaemonDescription

For an RGW instance that is deployed in an older version, we won't have
IP or port metadata in the DaemonDescription.  In that case, fall back
to the port in the ServiceSpec.  This should be safe since any such
instance will only have 1 daemon per host.

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 1bf8a2dacf0b38c8a12c84390b5b7be9f301eff2)
src/pybind/mgr/cephadm/services/cephadmservice.py diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.