cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Paramiko might not come standard everywhere (#54486)

Browse source 
* Paramiko might not come standard everywhere

There is a platform where paramiko isn't shipped but a special version
of paramiko just for our use is shipped.  This code imports paramiko
from that location.
This commit is contained in:
Toshio Kuratomi 2019-04-02 10:06:51 -07:00 committed by GitHub
parent 48c7501768
commit b03c16fa8b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 28 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/ansible/modules/network/iosxr/iosxr_user.py
View file

@ -216,11 +216,14 @@ try:
except ImportError: except ImportError:
HAS_B64 = False HAS_B64 = False
HAS_PARAMIKO = True
try: try:
import paramiko import paramiko
HAS_PARAMIKO = True
except ImportError: except ImportError:
HAS_PARAMIKO = False try:
import ansible_paramiko as paramiko
except ImportError:
HAS_PARAMIKO = False
class PublicKeyManager(object): class PublicKeyManager(object):

7
lib/ansible/modules/network/nxos/nxos_file_copy.py
View file

@ -165,11 +165,14 @@ from ansible.module_utils.network.nxos.nxos import nxos_argument_spec, check_arg
from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.basic import AnsibleModule
from ansible.module_utils._text import to_native, to_text, to_bytes from ansible.module_utils._text import to_native, to_text, to_bytes
HAS_PARAMIKO = True
try: try:
import paramiko import paramiko
HAS_PARAMIKO = True
except ImportError: except ImportError:
HAS_PARAMIKO = False try:
import ansible_paramiko as paramiko
except ImportError:
HAS_PARAMIKO = False
try: try:
from scp import SCPClient from scp import SCPClient

7
lib/ansible/modules/network/panos/_panos_admpwd.py
View file

@ -86,11 +86,14 @@ from ansible.module_utils.basic import AnsibleModule
import time import time
import sys import sys
HAS_LIB = True
try: try:
import paramiko import paramiko
HAS_LIB = True
except ImportError: except ImportError:
HAS_LIB = False try:
import ansible_paramiko as paramiko
except ImportError:
HAS_LIB = False
_PROMPTBUFF = 4096 _PROMPTBUFF = 4096

8
lib/ansible/modules/network/panos/_panos_cert_gen_ssh.py
View file

@ -91,11 +91,15 @@ from ansible.module_utils.basic import AnsibleModule
from ansible.module_utils._text import to_native from ansible.module_utils._text import to_native
import time import time
HAS_LIB = True
try: try:
import paramiko import paramiko
HAS_LIB = True
except ImportError: except ImportError:
HAS_LIB = False try:
import ansible_paramiko as paramiko
except ImportError:
HAS_LIB = False
_PROMPTBUFF = 4096 _PROMPTBUFF = 4096

8
lib/ansible/plugins/connection/paramiko_ssh.py
View file

@ -176,7 +176,13 @@ with warnings.catch_warnings():
try: try:
import paramiko import paramiko
HAVE_PARAMIKO = True HAVE_PARAMIKO = True
except (ImportError, AttributeError) as err: # paramiko and gssapi are incompatible and raise AttributeError not ImportError except ImportError:
try:
import ansible_paramiko as paramiko
HAVE_PARAMIKO = True
except (ImportError, AttributeError) as err: # paramiko and gssapi are incompatible and raise AttributeError not ImportError
PARAMIKO_IMP_ERR = err
except AttributeError as err: # paramiko and gssapi are incompatible and raise AttributeError not ImportError
PARAMIKO_IMP_ERR = err PARAMIKO_IMP_ERR = err