]> git.apps.os.sepia.ceph.com Git - ceph-ci.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, 27 May 2021 16:00:20 +0000 (12:00 -0400)
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>
src/cephadm/cephadm

index 5e1013ef712bcae4c118b11a35cead5de1cfa173..1f278bdb15b6747af6a7dca680f171e4a6bcc011 100755 (executable)
@@ -3150,10 +3150,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')