]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
mgr/cephadm: be aware of host's shortname and FQDN 50516/head
authorAdam King <adking@redhat.com>
Wed, 15 Feb 2023 22:07:09 +0000 (17:07 -0500)
committerAdam King <adking@redhat.com>
Mon, 13 Mar 2023 22:26:41 +0000 (18:26 -0400)
commita6c5b52d7d5e0064d44ebe1cadfa262ee4c34775
treed315e97324be44a1c422f74a80a270a06e5b475a
parentf29cb790e6e4755adccc150932bac1fe3e1706e7
mgr/cephadm: be aware of host's shortname and FQDN

The idea is to gether the shortname and FQDN as part
of gather-facts, and then if we ever try to check if a certain
host is in our internal inventory by hostname, we can check
these other known names. This should avoid issues where
we think a hostname specified by FQDN is not in our
inventory because we know the host by the shortname
or vice versa.

Fixes: https://tracker.ceph.com/issues/58738
Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit 6443cf15d54a5e50c245dd08c3db005bb8521b6a)

Conflicts:
src/pybind/mgr/cephadm/tests/test_cephadm.py
src/cephadm/cephadm
src/pybind/mgr/cephadm/inventory.py
src/pybind/mgr/cephadm/tests/test_cephadm.py
src/pybind/mgr/cephadm/tests/test_facts.py