]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge PR #40924 into master
authorSage Weil <sage@newdream.net>
Wed, 28 Apr 2021 18:27:07 +0000 (14:27 -0400)
committerSage Weil <sage@newdream.net>
Wed, 28 Apr 2021 18:27:07 +0000 (14:27 -0400)
commitf8e872ce2fc7d6f0f960d51942e3e9cc4d8cc265
tree81bd7d66b24a02178113ce2eb0fa5f49767ca193
parent0e273e67608981e722af4a0abfe0444eccdbeba5
parent459ffb52a15f8870dd45d3ec163ed27c1467623e
Merge PR #40924 into master

* refs/pull/40924/head:
mgr/cephadm: check hostname resolution before adding host
cephadm: provide a way to checkhost connection without /etc/hosts passed the shell
doc/cephadm: remove /etc/hosts from list of hostname resoltion methods

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Adam King <adking@redhat.com>
doc/cephadm/host-management.rst
src/cephadm/cephadm
src/pybind/mgr/cephadm/module.py
src/pybind/mgr/cephadm/serve.py