]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #41483 into master
authorSage Weil <sage@newdream.net>
Thu, 27 May 2021 23:14:53 +0000 (19:14 -0400)
committerSage Weil <sage@newdream.net>
Thu, 27 May 2021 23:14:53 +0000 (19:14 -0400)
* refs/pull/41483/head:
cephadm: stop passing --no-hosts to podman
mgr/nfs: use host.addr for backend IP where possible
mgr/cephadm: convert host addr if non-IP to IP
mgr/dashboard,prometheus: new method of getting mgr IP
doc/cephadm: remove any reference to the use of DNS or /etc/hosts
mgr/cephadm: use known host addr
mgr/cephadm: resolve IP at 'orch host add' time

Reviewed-by: Sebastian Wagner <swagner@suse.com>
1  2 
src/cephadm/cephadm
src/pybind/mgr/mgr_module.py
src/pybind/mgr/nfs/cluster.py

Simple merge
Simple merge
Simple merge