RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-18 09:25:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #109 from ceph/wip-6388

Browse Source 
only use host_key if it is not None
This commit is contained in:
Zack Cerza 2013-09-25 06:50:35 -07:00
commit 661676f442
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
teuthology/orchestra/connection.py
View File

@ -2,6 +2,7 @@ import base64
import paramiko
from ..config import config
def split_user(user_at_host):
try:
user, host = user_at_host.rsplit('@', 1)
@ -11,6 +12,7 @@ def split_user(user_at_host):
"Bad input to split_user: {user_at_host!r}".format(user_at_host=user_at_host)
return user, host
def create_key(keytype, key):
if keytype == 'ssh-rsa':
return paramiko.rsakey.RSAKey(data=base64.decodestring(key))
@ -19,19 +21,22 @@ def create_key(keytype, key):
else:
raise ValueError('keytype must be ssh-rsa or ssh-dsa')
def connect(user_at_host, host_key=None, keep_alive=False,
_SSHClient=None, _create_key=None):
user, host = split_user(user_at_host)
if _SSHClient is None:
_SSHClient = paramiko.SSHClient
ssh = _SSHClient()
if host_key is None:
ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy())
if _create_key is None:
_create_key = create_key
if host_key is None and config.verify_host_keys is True:
ssh.load_system_host_keys()
if host_key is None:
ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy())
if config.verify_host_keys is True:
ssh.load_system_host_keys()
else:
keytype, key = host_key.split(' ', 1)
ssh.get_host_keys().add(