From 4b339a65b025c7b52ef1e4e8282f2421d6402537 Mon Sep 17 00:00:00 2001 From: Shiva Shankar Vaddepally Date: Wed, 11 Dec 2024 10:29:06 +0000 Subject: [PATCH] resolved some sanity isues --- ansible.cfg | 8 ---- plugins/connection/ssh_netscaler_adc.py | 58 +++++++++++++------------ requirements.txt | 2 +- 3 files changed, 31 insertions(+), 37 deletions(-) delete mode 100644 ansible.cfg diff --git a/ansible.cfg b/ansible.cfg deleted file mode 100644 index 8d20b8747..000000000 --- a/ansible.cfg +++ /dev/null @@ -1,8 +0,0 @@ -[defaults] -# ...existing code... -collections_paths = ~/.ansible/collections:/usr/share/ansible/collections -# ...existing code... - -[connection_netscaler.adc.ssh_netscaler_adc] -pkcs11_provider = /usr/lib/opensc-pkcs11.so -# ...existing code... \ No newline at end of file diff --git a/plugins/connection/ssh_netscaler_adc.py b/plugins/connection/ssh_netscaler_adc.py index 8bfd0ba26..4820902b7 100644 --- a/plugins/connection/ssh_netscaler_adc.py +++ b/plugins/connection/ssh_netscaler_adc.py @@ -22,18 +22,20 @@ __metaclass__ = type DOCUMENTATION = ''' - connection: ssh_netscaler_adc + name: ssh_netscaler_adc short_description: connect via ssh client binary with Netscaler ADC bypassing the cli description: - This connection plugin allows ansible to communicate to the target Netscaler ADC via normal ssh command line. - The only authentication method that works with this plugin is with ssh key file. - The input options supported by this connection plugin are the same as the ssh connection plugin of Ansible. author: - - Sergios Lenis (sergios.lenis@citrix.com) - - George Nikolopoulos (giorgos.nikolopoulos@citrix.com) - - Shiva Shankar Vaddepally (shivashankar.vaddepally@cloud.com) - - version_added: "1.0.0" + - name: Sergios Lenis + email: sergios.lenis@citrix.com + - name: George Nikolopoulos + email: giorgos.nikolopoulos@citrix.com + - name: Shiva Shankar Vaddepally + email: shivashankar.vaddepally@cloud.com + version_added: "2.0.0" options: host: description: Hostname/ip to connect to. @@ -74,7 +76,7 @@ - name: ANSIBLE_SSHPASS_PROMPT vars: - name: ansible_sshpass_prompt - version_added: '2.10' + version_added: "2.0.0" ssh_args: description: Arguments to pass to all ssh cli tools default: '-C -o ControlMaster=auto -o ControlPersist=60s' @@ -85,7 +87,7 @@ - name: ANSIBLE_SSH_ARGS vars: - name: ansible_ssh_args - version_added: '2.7' + version_added: "2.0.0" ssh_common_args: description: Common extra args for all ssh CLI tools ini: @@ -110,7 +112,7 @@ version_added: "2.2" vars: - name: ansible_ssh_executable - version_added: '2.7' + version_added: "2.0.0" sftp_executable: default: sftp description: @@ -121,7 +123,7 @@ version_added: "2.6" vars: - name: ansible_sftp_executable - version_added: '2.7' + version_added: "2.0.0" scp_executable: default: scp description: @@ -132,40 +134,40 @@ version_added: "2.6" vars: - name: ansible_scp_executable - version_added: '2.7' + version_added: "2.0.0" scp_extra_args: description: Extra exclusive to the ``scp`` CLI vars: - name: ansible_scp_extra_args env: - name: ANSIBLE_SCP_EXTRA_ARGS - version_added: '2.7' + version_added: "2.0.0" ini: - key: scp_extra_args section: ssh_connection - version_added: '2.7' + version_added: "2.0.0" sftp_extra_args: description: Extra exclusive to the ``sftp`` CLI vars: - name: ansible_sftp_extra_args env: - name: ANSIBLE_SFTP_EXTRA_ARGS - version_added: '2.7' + version_added: "2.0.0" ini: - key: sftp_extra_args section: ssh_connection - version_added: '2.7' + version_added: "2.0.0" ssh_extra_args: description: Extra exclusive to the 'ssh' CLI vars: - name: ansible_ssh_extra_args env: - name: ANSIBLE_SSH_EXTRA_ARGS - version_added: '2.7' + version_added: "2.0.0" ini: - key: ssh_extra_args section: ssh_connection - version_added: '2.7' + version_added: "2.0.0" retries: # constant: ANSIBLE_SSH_RETRIES description: Number of attempts to connect. @@ -180,7 +182,7 @@ key: retries vars: - name: ansible_ssh_retries - version_added: '2.7' + version_added: "2.0.0" reconnection_retries: description: Number of attempts to connect. default: 0 @@ -194,7 +196,7 @@ key: retries vars: - name: ansible_ssh_retries - version_added: '2.7' + version_added: "2.0.0" port: description: Remote port to connect to. type: int @@ -262,7 +264,7 @@ section: ssh_connection vars: - name: ansible_control_path - version_added: '2.7' + version_added: "2.0.0" control_path_dir: default: ~/.ansible/cp description: @@ -275,7 +277,7 @@ key: control_path_dir vars: - name: ansible_control_path_dir - version_added: '2.7' + version_added: "2.0.0" sftp_batch_mode: default: 'yes' description: 'TODO: write it' @@ -285,7 +287,7 @@ type: bool vars: - name: ansible_sftp_batch_mode - version_added: '2.7' + version_added: "2.0.0" ssh_transfer_method: description: - "Preferred method to use when transferring files over ssh" @@ -306,7 +308,7 @@ - {key: scp_if_ssh, section: ssh_connection} vars: - name: ansible_scp_if_ssh - version_added: '2.7' + version_added: "2.0.0" use_tty: version_added: '2.5' default: 'yes' @@ -317,7 +319,7 @@ type: bool vars: - name: ansible_ssh_use_tty - version_added: '2.7' + version_added: "2.0.0" timeout: default: 10 description: @@ -326,16 +328,16 @@ env: - name: ANSIBLE_TIMEOUT - name: ANSIBLE_SSH_TIMEOUT - version_added: '2.11' + version_added: "2.0.0" ini: - key: timeout section: defaults - key: timeout section: ssh_connection - version_added: '2.11' + version_added: "2.0.0" vars: - name: ansible_ssh_timeout - version_added: '2.11' + version_added: "2.0.0" cli: - name: timeout type: integer @@ -349,7 +351,7 @@ - name: ANSIBLE_PKCS11_PROVIDER vars: - name: ansible_pkcs11_provider - version_added: '2.11' + version_added: "2.0.0" ''' import codecs diff --git a/requirements.txt b/requirements.txt index 5ae65c636..f00a5626f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,4 +7,4 @@ antsibull-docs sphinx sphinx-ansible-theme galaxy-importer==0.5.0 -ansible-core>=2.14.0 +ansible-core>=2.15.13