diff --git a/salt/utils/cloud.py b/salt/utils/cloud.py index 16c0a16810..1b1f60d1a2 100644 --- a/salt/utils/cloud.py +++ b/salt/utils/cloud.py @@ -1394,12 +1394,12 @@ def scp_file(dest_path, contents, kwargs): ssh_args.extend([ # Setup ProxyCommand '-oProxyCommand="ssh {0} {1} {2} {3} {4}@{5} -p {6} nc -q0 %h %p"'.format( - # Don't add new hosts to the host key database - '-oStrictHostKeyChecking=no', - # Set hosts key database path to /dev/null, ie, non-existing - '-oUserKnownHostsFile=/dev/null', - # Don't re-use the SSH connection. Less failures. - '-oControlPath=none', + # Don't add new hosts to the host key database + '-oStrictHostKeyChecking=no', + # Set hosts key database path to /dev/null, ie, non-existing + '-oUserKnownHostsFile=/dev/null', + # Don't re-use the SSH connection. Less failures. + '-oControlPath=none', ssh_gateway_key, ssh_gateway_user, ssh_gateway,