Permalink
Browse files

specify sshkey is *private*

  • Loading branch information...
1 parent fb00667 commit 852ec36d6d6436dcd9bba9cefbb3b752686fe158 @minrk committed Aug 16, 2011
Showing with 2 additions and 2 deletions.
  1. +1 −1 IPython/parallel/client/client.py
  2. +1 −1 IPython/parallel/engine/engine.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
@@ -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.""")

0 comments on commit 852ec36

Please sign in to comment.