Commit ee268535 by Michael DeHaan

Fix port overrides such that with fireball mode you don't have to specify an explicit port.

parent aaa413db
......@@ -51,7 +51,7 @@ class PlayBook(object):
remote_user = C.DEFAULT_REMOTE_USER,
remote_pass = C.DEFAULT_REMOTE_PASS,
sudo_pass = C.DEFAULT_SUDO_PASS,
remote_port = C.DEFAULT_REMOTE_PORT,
remote_port = None,
transport = C.DEFAULT_TRANSPORT,
private_key_file = C.DEFAULT_PRIVATE_KEY_FILE,
callbacks = None,
......
......@@ -382,7 +382,9 @@ class Runner(object):
conn = None
actual_host = inject.get('ansible_ssh_host', host)
actual_port = inject.get('ansible_ssh_port', port)
actual_port = port
if self.transport in ['paramiko', 'ssh' ]:
actual_port = inject.get('ansible_ssh_port', port)
# the delegated host may have different SSH port configured, etc
# and we need to transfer those, and only those, variables
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment