On Mon, Feb 22, 2010 at 03:37:43PM +0100, René Nussbaumer wrote: > > Signed-off-by: René Nussbaumer <[email protected]> > --- > lib/ssh.py | 12 +++++++++--- > 1 files changed, 9 insertions(+), 3 deletions(-) > > diff --git a/lib/ssh.py b/lib/ssh.py > index 4610e2d..16ce61e 100644 > --- a/lib/ssh.py > +++ b/lib/ssh.py > @@ -75,7 +75,7 @@ class SshRunner: > self.cluster_name = cluster_name > > def _BuildSshOptions(self, batch, ask_key, use_cluster_key, > - strict_host_check): > + strict_host_check, private_key=None): > """Builds a list with needed SSH options. > > @param batch: same as ssh's batch option > @@ -84,6 +84,7 @@ class SshRunner: > @param use_cluster_key: if True, use the cluster name as the > HostKeyAlias name > @param strict_host_check: this makes the host key checking strict > + @param private_key: use this private key instead of the default > > @rtype: list > @return: the list of options ready to use in L{utils.RunCmd} > @@ -99,6 +100,9 @@ class SshRunner: > if use_cluster_key: > options.append("-oHostKeyAlias=%s" % self.cluster_name) > > + if private_key: > + options.append('-i%s' % private_key)
Please use consistent quotes, in this case ", as above. LGTM.
