rapi.client, http.client: Format url correctly when using IPv6

[ganeti-local] / lib / ssh.py

diff --git a/lib/ssh.py b/lib/ssh.py
index b3116d3..0a65f9f 100644 (file)
--- a/lib/ssh.py
+++ b/lib/ssh.py
@@ -53,15 +53,10 @@ def GetUserFiles(user, mkdir=False):
     raise errors.OpExecError("Cannot resolve home of user %s" % user)
 
   ssh_dir = utils.PathJoin(user_dir, ".ssh")
-  if not os.path.lexists(ssh_dir):
-    if mkdir:
-      try:
-        os.mkdir(ssh_dir, 0700)
-      except EnvironmentError, err:
-        raise errors.OpExecError("Can't create .ssh dir for user %s: %s" %
-                                 (user, str(err)))
+  if mkdir:
+    utils.EnsureDirs([(ssh_dir, constants.SECURE_DIR_MODE)])
   elif not os.path.isdir(ssh_dir):
-    raise errors.OpExecError("path ~%s/.ssh is not a directory" % user)
+    raise errors.OpExecError("Path %s is not a directory" % ssh_dir)
 
   return [utils.PathJoin(ssh_dir, base)
           for base in ["id_dsa", "id_dsa.pub", "authorized_keys"]]
@@ -75,7 +70,7 @@ class SshRunner:
     self.cluster_name = cluster_name
 
   def _BuildSshOptions(self, batch, ask_key, use_cluster_key,
-                       strict_host_check, private_key=None):
+                       strict_host_check, private_key=None, quiet=True):
     """Builds a list with needed SSH options.
 
     @param batch: same as ssh's batch option
@@ -85,6 +80,7 @@ class SshRunner:
         HostKeyAlias name
     @param strict_host_check: this makes the host key checking strict
     @param private_key: use this private key instead of the default
+    @param quiet: whether to enable -q to ssh
 
     @rtype: list
     @return: the list of options ready to use in L{utils.RunCmd}
@@ -95,11 +91,15 @@ class SshRunner:
       "-oHashKnownHosts=no",
       "-oGlobalKnownHostsFile=%s" % constants.SSH_KNOWN_HOSTS_FILE,
       "-oUserKnownHostsFile=/dev/null",
+      "-oCheckHostIp=no",
       ]
 
     if use_cluster_key:
       options.append("-oHostKeyAlias=%s" % self.cluster_name)
 
+    if quiet:
+      options.append("-q")
+
     if private_key:
       options.append("-i%s" % private_key)
 
@@ -132,7 +132,7 @@ class SshRunner:
 
   def BuildCmd(self, hostname, user, command, batch=True, ask_key=False,
                tty=False, use_cluster_key=True, strict_host_check=True,
-               private_key=None):
+               private_key=None, quiet=True):
     """Build an ssh command to execute a command on a remote node.
 
     @param hostname: the target host, string
@@ -146,15 +146,17 @@ class SshRunner:
         cluster-global SSH key
     @param strict_host_check: whether to check the host's SSH key at all
     @param private_key: use this private key instead of the default
+    @param quiet: whether to enable -q to ssh
 
     @return: the ssh call to run 'command' on the remote host.
 
     """
-    argv = [constants.SSH, "-q"]
+    argv = [constants.SSH]
     argv.extend(self._BuildSshOptions(batch, ask_key, use_cluster_key,
-                                      strict_host_check, private_key))
+                                      strict_host_check, private_key,
+                                      quiet=quiet))
     if tty:
-      argv.append("-t")
+      argv.extend(["-t", "-t"])
     argv.extend(["%s@%s" % (user, hostname), command])
     return argv
 
@@ -190,7 +192,7 @@ class SshRunner:
       logging.error("File %s does not exist", filename)
       return False
 
-    command = [constants.SCP, "-q", "-p"]
+    command = [constants.SCP, "-p"]
     command.extend(self._BuildSshOptions(True, False, True, True))
     command.append(filename)
     command.append("%s:%s" % (node, filename))