Commit fff33d70 authored by Michael Hanselmann's avatar Michael Hanselmann
Browse files

Use constants for “ssh” and “scp” binaries instead of magic values

Reviewed-by: ultrotter
parent f408b346
......@@ -146,6 +146,8 @@ SSH_HOST_DSA_PRIV = SSH_CONFIG_DIR + "ssh_host_dsa_key"
SSH_HOST_DSA_PUB = SSH_HOST_DSA_PRIV + ".pub"
SSH_HOST_RSA_PRIV = SSH_CONFIG_DIR + "ssh_host_rsa_key"
SSH_HOST_RSA_PUB = SSH_HOST_RSA_PRIV + ".pub"
SSH = "ssh"
SCP = "scp"
# reboot types
INSTANCE_REBOOT_SOFT = "soft"
......
......@@ -116,7 +116,7 @@ class SshRunner:
The ssh call to run 'command' on the remote host.
"""
argv = ["ssh", "-q"]
argv = [constants.SSH, "-q"]
argv.extend(KNOWN_HOSTS_OPTS)
argv.append(self._GetHostKeyAliasOption())
if batch:
......@@ -171,7 +171,7 @@ class SshRunner:
logger.Error("file %s must be an absolute path" % (filename))
return False
command = ["scp", "-q", "-p"]
command = [constants.SCP, "-q", "-p"]
command.extend(KNOWN_HOSTS_OPTS)
command.extend(BATCH_MODE_OPTS)
command.append(self._GetHostKeyAliasOption())
......
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