ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-08-05 21:54:22 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

[stable-10] Backport fixes from community.proxmox (#10553)

Browse source 
* Import paramiko directly.

8f90ab075c

* Remove deprecated disable_lookups parameter.

c0fc31241b
This commit is contained in:
Felix Fontein 2025-08-02 17:29:42 +02:00 • committed by GitHub
commit 4c7f64b121
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 17 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
plugins/connection/proxmox_pct_remote.py
View file

@ -398,6 +398,7 @@ import os
import pathlib
import socket
import tempfile
import traceback
import typing as t
from ansible.errors import (
@ -406,14 +407,20 @@ from ansible.errors import (
AnsibleError,
)
from ansible_collections.community.general.plugins.module_utils._filelock import FileLock, LockTimeout
from ansible_collections.community.general.plugins.module_utils.version import LooseVersion
from ansible.module_utils.common.text.converters import to_bytes, to_native, to_text
from ansible.module_utils.compat.paramiko import PARAMIKO_IMPORT_ERR, paramiko
from ansible.module_utils.compat.version import LooseVersion
from ansible.plugins.connection import ConnectionBase
from ansible.utils.display import Display
from ansible.utils.path import makedirs_safe
from binascii import hexlify
try:
import paramiko
PARAMIKO_IMPORT_ERR = None
except ImportError:
paramiko = None
PARAMIKO_IMPORT_ERR = traceback.format_exc()
display = Display()
@ -513,7 +520,7 @@ class Connection(ConnectionBase):
def _connect(self) -> Connection:
""" activates the connection object """
if paramiko is None:
if PARAMIKO_IMPORT_ERR is not None:
raise AnsibleError(f'paramiko is not installed: {to_native(PARAMIKO_IMPORT_ERR)}')
port = self.get_option('port')