]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 482eda5) | patch
mgr/cephadm: tolerate old host inventory without 'hostname' key 39167/head
authorSage Weil <sage@newdream.net>
Mon, 11 Jan 2021 18:41:12 +0000 (12:41 -0600)
committerSebastian Wagner <sebastian.wagner@suse.com>
Fri, 29 Jan 2021 15:05:43 +0000 (16:05 +0100)
commit1e8850a0a366de82cf8c8b6248e8de7e662d1822
treec29f8b84b1c97814755f1b7199ffb9e170cb58d0tree | snapshot
parent482eda5eea4262ce6a42509d97bad80a5b5fb28ecommit | diff
mgr/cephadm: tolerate old host inventory without 'hostname' key

Older cephadm clusters lack the 'hostname' key in the host spec.  e.g.,

 "cpach": {"addr": "cpach", "labels": ["mon"]}, "eutow": {"addr": "eutow", "labels": ["mon"]}, "stud": {"addr": "stud", "labels": ["mon"]}}

Populate hostname from the dict key if necessary for compatibility.

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