From 852ec36d6d6436dcd9bba9cefbb3b752686fe158 2011-08-16 23:09:32 From: MinRK Date: 2011-08-16 23:09:32 Subject: [PATCH] specify sshkey is *private* --- diff --git a/IPython/parallel/client/client.py b/IPython/parallel/client/client.py index 846b8eb..f6d4698 100644 --- a/IPython/parallel/client/client.py +++ b/IPython/parallel/client/client.py @@ -171,7 +171,7 @@ class Client(HasTraits): A string of the form passed to ssh, i.e. 'server.tld' or 'user@server.tld:port' If keyfile or password is specified, and this is not, it will default to the ip given in addr. - sshkey : str; path to public ssh key file + sshkey : str; path to ssh private key file This specifies a key to be used in ssh login, default None. Regular default ssh keys will be used without specifying this argument. password : str diff --git a/IPython/parallel/engine/engine.py b/IPython/parallel/engine/engine.py index 777c5d1..7cf07ef 100755 --- a/IPython/parallel/engine/engine.py +++ b/IPython/parallel/engine/engine.py @@ -57,7 +57,7 @@ class EngineFactory(RegistrationFactory): sshserver=Unicode(config=True, help="""The SSH server to use for tunneling connections to the Controller.""") sshkey=Unicode(config=True, - help="""The SSH keyfile to use when tunneling connections to the Controller.""") + help="""The SSH private key file to use when tunneling connections to the Controller.""") paramiko=Bool(sys.platform == 'win32', config=True, help="""Whether to use paramiko instead of openssh for tunnels.""")