Merge pull request #56 from elenagerman/ssh-private-key

key-filename option was added to ssh

Author: bradmwilliams

ansible/rebuild_module.digest

@@ -1 +1 @@
-beba445971676e714868c715f59c07e0  -
+3cc90352c787fb2a66626b33f149e1f9  -

ansible/roles/openshift_client_python/library/openshift_client_python.py

@@ -1352,6 +1352,7 @@ def node_ssh_client(apiobj_node_name_or_qname=None,
                     port=22,
                     username=None,
                     password=None,
+                    key_filename=None,
                     auto_add_host=True,
                     connect_timeout=600,
                     through_client_host=True,
@@ -1365,6 +1366,7 @@ def node_ssh_client(apiobj_node_name_or_qname=None,
     :param port: The ssh port
     :param username: The username to use
     :param password: The username's password
+    :param key_filename: The filename of optional private key and/or cert to try for authentication
     :param auto_add_host: Whether to auto accept host certificates
     :param connect_timeout: Connection timeout
     :param through_client_host: If True, and client_host is being used, ssh will be initiated
@@ -1423,8 +1425,8 @@ def node_ssh_client(apiobj_node_name_or_qname=None,
                     password = cur_context().get_ssh_password()
 
             ssh_client.connect(hostname=address, port=port, username=username,
-                               password=password, timeout=connect_timeout,
-                               sock=host_sock)
+                               password=password, key_filename=key_filename,
+                               timeout=connect_timeout, sock=host_sock)
 
             # Enable agent fowarding
             paramiko.agent.AgentRequestHandler(ssh_client.get_transport().open_session())
@@ -1439,6 +1441,7 @@ def node_ssh_await(apiobj_node_name_or_qname=None,
                    port=22,
                    username=None,
                    password=None,
+                   key_filename=None,
                    auto_add_host=True,
                    through_client_host=True,
                    address_type_pref="ExternalDNS,ExternalIP,Hostname"):
@@ -1449,6 +1452,7 @@ def node_ssh_await(apiobj_node_name_or_qname=None,
     :param port:
     :param username:
     :param password:
+    :param key_filename:
     :param auto_add_host:
     :param through_client_host:
     :param address_type_pref:
@@ -1464,6 +1468,7 @@ def node_ssh_await(apiobj_node_name_or_qname=None,
                                  port=port,
                                  username=username,
                                  password=password,
+                                 key_filename=key_filename,
                                  auto_add_host=auto_add_host,
                                  connect_timeout=25,
                                  through_client_host=through_client_host,
@@ -1482,6 +1487,7 @@ def node_ssh_client_exec(apiobj_node_name_or_qname=None,
                          port=22,
                          username=None,
                          password=None,
+                         key_filename=None,
                          auto_add_host=True,
                          connect_timeout=600,
                          through_client_host=True,
@@ -1497,6 +1503,7 @@ def node_ssh_client_exec(apiobj_node_name_or_qname=None,
     :param port: The ssh port
     :param username: The username to use
     :param password: The username's password
+    :param key_filename: The filename of optional private key and/or cert to try for authentication
     :param auto_add_host: Whether to auto accept host certificates
     :param connect_timeout: Connection timeout
     :param through_client_host: If True, and client_host is being used, ssh will be initiated
@@ -1511,6 +1518,7 @@ def node_ssh_client_exec(apiobj_node_name_or_qname=None,
                          port=port,
                          username=username,
                          password=password,
+                         key_filename=key_filename,
                          auto_add_host=auto_add_host,
                          connect_timeout=connect_timeout,
                          through_client_host=through_client_host,