From 3ac24525fdce6575e53bcfe326d2f56d607b8989 Mon Sep 17 00:00:00 2001 From: Logan V Date: Sat, 10 Jun 2017 00:42:02 -0500 Subject: [PATCH] Actually fix connection plugin physical host var If ansible_host is defined on the physical_host inventory item, physical_host_addr will be set and used as the ssh destination. However if ansible_host is not defined, we will fall back to the physical_host inventory hostname. Related-Bug: 1695944 Change-Id: I90ccc12fd044f08a60c84f0b8ae5d7fd783760dd --- connection/ssh.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/connection/ssh.py b/connection/ssh.py index 547d431..fff6f40 100644 --- a/connection/ssh.py +++ b/connection/ssh.py @@ -62,8 +62,9 @@ class Connection(SSH.Connection): def set_host_overrides(self, host, hostvars=None): if self._container_check() or self._chroot_check(): physical_host_addr = hostvars.get('physical_host_addr') - if physical_host_addr: - self.host = self._play_context.remote_addr = physical_host_addr + if not physical_host_addr: + physical_host_addr = self.physical_host + self.host = self._play_context.remote_addr = physical_host_addr def exec_command(self, cmd, in_data=None, sudoable=True): """run a command on the remote host."""