mirror of
https://github.com/ansible-collections/community.general.git
synced 2026-05-07 13:52:54 +00:00
Change default smart connection to ssh on macOS and remove paramiko from requirements.txt (#54738)
* Remove default use of paramiko connection plugin on macOS
This fix was originally to work around a bug that caused a kernel panic on macOS
that has since been fixed.
* Remove paramiko from requirements.txt
* Move paramiko checking to common place
* Drop the warnings obfiscation code
* Update pip installation instructions to reflect upstream instructions
* Fix tests on CentOS 6 (Python 2.6) that now show Python deprecation warnings
* Add changelog fragment
This commit is contained in:
@@ -206,6 +206,7 @@ from copy import deepcopy
|
||||
import collections
|
||||
|
||||
from ansible.module_utils.basic import AnsibleModule
|
||||
from ansible.module_utils.compat.paramiko import paramiko
|
||||
from ansible.module_utils.network.common.utils import remove_default_spec
|
||||
from ansible.module_utils.network.iosxr.iosxr import get_config, load_config, is_netconf, is_cliconf
|
||||
from ansible.module_utils.network.iosxr.iosxr import iosxr_argument_spec, build_xml, etree_findall
|
||||
@@ -216,15 +217,6 @@ try:
|
||||
except ImportError:
|
||||
HAS_B64 = False
|
||||
|
||||
HAS_PARAMIKO = True
|
||||
try:
|
||||
import paramiko
|
||||
except ImportError:
|
||||
try:
|
||||
import ansible_paramiko as paramiko
|
||||
except ImportError:
|
||||
HAS_PARAMIKO = False
|
||||
|
||||
|
||||
class PublicKeyManager(object):
|
||||
def __init__(self, module, result):
|
||||
@@ -693,7 +685,7 @@ def main():
|
||||
msg='library base64 is required but does not appear to be '
|
||||
'installed. It can be installed using `pip install base64`'
|
||||
)
|
||||
if not HAS_PARAMIKO:
|
||||
if paramiko is None:
|
||||
module.fail_json(
|
||||
msg='library paramiko is required but does not appear to be '
|
||||
'installed. It can be installed using `pip install paramiko`'
|
||||
|
||||
@@ -160,20 +160,12 @@ import re
|
||||
import time
|
||||
import traceback
|
||||
|
||||
from ansible.module_utils.compat.paramiko import paramiko
|
||||
from ansible.module_utils.network.nxos.nxos import run_commands
|
||||
from ansible.module_utils.network.nxos.nxos import nxos_argument_spec, check_args
|
||||
from ansible.module_utils.basic import AnsibleModule
|
||||
from ansible.module_utils._text import to_native, to_text, to_bytes
|
||||
|
||||
HAS_PARAMIKO = True
|
||||
try:
|
||||
import paramiko
|
||||
except ImportError:
|
||||
try:
|
||||
import ansible_paramiko as paramiko
|
||||
except ImportError:
|
||||
HAS_PARAMIKO = False
|
||||
|
||||
try:
|
||||
from scp import SCPClient
|
||||
HAS_SCP = True
|
||||
@@ -394,7 +386,7 @@ def main():
|
||||
'installed. It can be installed using `pip install pexpect`'
|
||||
)
|
||||
else:
|
||||
if not HAS_PARAMIKO:
|
||||
if paramiko is None:
|
||||
module.fail_json(
|
||||
msg='library paramiko is required when file_pull is False but does not appear to be '
|
||||
'installed. It can be installed using `pip install paramiko`'
|
||||
|
||||
@@ -81,20 +81,11 @@ ANSIBLE_METADATA = {'metadata_version': '1.1',
|
||||
'status': ['deprecated'],
|
||||
'supported_by': 'community'}
|
||||
|
||||
|
||||
from ansible.module_utils.basic import AnsibleModule
|
||||
from ansible.module_utils.compat.paramiko import paramiko
|
||||
import time
|
||||
import sys
|
||||
|
||||
HAS_LIB = True
|
||||
try:
|
||||
import paramiko
|
||||
except ImportError:
|
||||
try:
|
||||
import ansible_paramiko as paramiko
|
||||
except ImportError:
|
||||
HAS_LIB = False
|
||||
|
||||
_PROMPTBUFF = 4096
|
||||
|
||||
|
||||
@@ -189,7 +180,7 @@ def main():
|
||||
newpassword=dict(no_log=True, required=True)
|
||||
)
|
||||
module = AnsibleModule(argument_spec=argument_spec, supports_check_mode=True)
|
||||
if not HAS_LIB:
|
||||
if paramiko is None:
|
||||
module.fail_json(msg='paramiko is required for this module')
|
||||
|
||||
ip_address = module.params["ip_address"]
|
||||
|
||||
@@ -87,20 +87,11 @@ ANSIBLE_METADATA = {'metadata_version': '1.1',
|
||||
'supported_by': 'community'}
|
||||
|
||||
|
||||
from ansible.module_utils.basic import AnsibleModule
|
||||
from ansible.module_utils._text import to_native
|
||||
from ansible.module_utils.basic import AnsibleModule
|
||||
from ansible.module_utils.compat.paramiko import paramiko
|
||||
import time
|
||||
|
||||
HAS_LIB = True
|
||||
try:
|
||||
import paramiko
|
||||
except ImportError:
|
||||
try:
|
||||
import ansible_paramiko as paramiko
|
||||
except ImportError:
|
||||
HAS_LIB = False
|
||||
|
||||
|
||||
_PROMPTBUFF = 4096
|
||||
|
||||
|
||||
@@ -174,7 +165,7 @@ def main():
|
||||
)
|
||||
module = AnsibleModule(argument_spec=argument_spec, supports_check_mode=False,
|
||||
required_one_of=[['key_filename', 'password']])
|
||||
if not HAS_LIB:
|
||||
if paramiko is None:
|
||||
module.fail_json(msg='paramiko is required for this module')
|
||||
|
||||
ip_address = module.params["ip_address"]
|
||||
|
||||
Reference in New Issue
Block a user