saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #39419 from The-Loeki/bp-ssh-ipv6

Browse source 
Backport Salt-SSH IPv6 fixes to 2016.11
This commit is contained in:
Mike Place 2017-02-15 10:33:12 -07:00 • committed by GitHub
commit 47872355a8
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
salt/client/ssh/shell.py
View file

@ -66,7 +66,8 @@ class Shell(object):
sudo_user=None,
remote_port_forwards=None):
self.opts = opts
self.host = host
# ssh <ipv6>, but scp [<ipv6]:/path
self.host = host.strip('[]')
self.user = user
self.port = port
self.passwd = str(passwd) if passwd else passwd
@ -320,7 +321,12 @@ class Shell(object):
if makedirs:
self.exec_cmd('mkdir -p {0}'.format(os.path.dirname(remote)))
cmd = '{0} {1}:{2}'.format(local, self.host, remote)
# scp needs [<ipv6}
host = self.host
if ':' in host:
host = '[{0}]'.format(host)
cmd = '{0} {1}:{2}'.format(local, host, remote)
cmd = self._cmd_str(cmd, ssh='scp')
logmsg = 'Executing command: {0}'.format(cmd)