valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Salt-SSH deal with raw IPv6 addresses

Browse Source
This commit is contained in:
Ronald van Zantvoort 2017-01-19 21:07:35 +01:00
parent d489e05bd4
commit 047fc51d8a
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
salt/client/ssh/shell.py
View File

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