]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
cephadm: stop passing --no-hosts to podman
authorSage Weil <sage@newdream.net>
Tue, 25 May 2021 17:55:08 +0000 (13:55 -0400)
committerSage Weil <sage@newdream.net>
Thu, 3 Jun 2021 12:43:09 +0000 (07:43 -0500)
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)

src/cephadm/cephadm

index 1c23a7ce6378b269a4f87cf8128172ac1222bddd..de069832ccc34049aab8775d8a358e423f3cbab6 100755 (executable)
@@ -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')