Revision 8062638d
b/lib/ssh.py | ||
---|---|---|
31 | 31 |
from ganeti import utils |
32 | 32 |
from ganeti import errors |
33 | 33 |
from ganeti import constants |
34 |
from ganeti import netutils |
|
34 | 35 |
|
35 | 36 |
|
36 | 37 |
def FormatParamikoFingerprint(fingerprint): |
... | ... | |
220 | 221 |
command = [constants.SCP, "-p"] |
221 | 222 |
command.extend(self._BuildSshOptions(True, False, True, True)) |
222 | 223 |
command.append(filename) |
224 |
if netutils.IP6Address.IsValid(node): |
|
225 |
node = netutils.FormatAddress((node, None)) |
|
226 |
|
|
223 | 227 |
command.append("%s:%s" % (node, filename)) |
224 | 228 |
|
225 | 229 |
result = utils.RunCmd(command) |
Also available in: Unified diff