From: Sage Weil <sage@newdream.net>
Date: Tue, 25 May 2021 17:55:08 +0000 (-0400)
Subject: cephadm: stop passing --no-hosts to podman
X-Git-Tag: v16.2.5~87^2~12
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5cccca4ed80d6a744da434a8e109b508b3e1e0bf;p=ceph.git

cephadm: stop passing --no-hosts to podman

This reverts cfc1f914ce74f1fd1f45e2efd3ba2ddcb2da129a, which is no longer
neceesary because (1) we don't use socket.getfqdn(), and (2) we generally
do not rely on DNS or /etc/hosts at all anymore (with the exception of
the upgrade transition).

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit d1bb94ba4c4b8401bf7799b7da3a8f5c2fd228c6)
---

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 1c23a7ce6378..de069832ccc3 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -3122,10 +3122,6 @@ class CephContainer:
         ]
 
         if isinstance(self.ctx.container_engine, Podman):
-            # podman adds the container *name* to /etc/hosts (for 127.0.1.1)
-            # by default, which makes python's socket.getfqdn() return that
-            # instead of a valid hostname.
-            cmd_args.append('--no-hosts')
             if os.path.exists('/etc/ceph/podman-auth.json'):
                 cmd_args.append('--authfile=/etc/ceph/podman-auth.json')