Updated Branches: refs/heads/trunk 53e4fd002 -> 3a86c01e6
Allow user to pass both - "password" and "key" argument to the ParamikoSSHClient constructor. Before this change, those arguments were mutally exclusive. Part of LIBCLOUD-461, resolves #194. Signed-off-by: Tomaz Muraus <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/039cb791 Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/039cb791 Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/039cb791 Branch: refs/heads/trunk Commit: 039cb7917b8cda2015ddbd31c9c754ac70a1b2ab Parents: 53e4fd0 Author: Markos Gogoulos <[email protected]> Authored: Fri Dec 13 17:24:02 2013 +0200 Committer: Tomaz Muraus <[email protected]> Committed: Thu Jan 9 00:03:38 2014 +0100 ---------------------------------------------------------------------- libcloud/compute/ssh.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/039cb791/libcloud/compute/ssh.py ---------------------------------------------------------------------- diff --git a/libcloud/compute/ssh.py b/libcloud/compute/ssh.py index 0924bad..6b814ec 100644 --- a/libcloud/compute/ssh.py +++ b/libcloud/compute/ssh.py @@ -179,11 +179,8 @@ class ParamikoSSHClient(BaseSSHClient): if self.password: conninfo['password'] = self.password - elif self.key: + if self.key: conninfo['key_filename'] = self.key - else: - conninfo['allow_agent'] = True - conninfo['look_for_keys'] = True if self.timeout: conninfo['timeout'] = self.timeout
