ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

[proxmox] Use proxmoxer_version instead of server API version (#6980)

Browse source 
* Use proxmoxer_version instead of server API version

* Add changelog fragment
This commit is contained in:
Sergei Antipov 2023-07-20 02:40:02 -04:00 • committed by GitHub
parent f6714edabb
commit 796ad3565e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/6980-proxmox-fix-token-auth.yml Normal file
View file

@ -0,0 +1,2 @@
bugfixes:
- proxmox module utils - fix proxmoxer library version check (https://github.com/ansible-collections/community.general/issues/6974, https://github.com/ansible-collections/community.general/issues/6975, https://github.com/ansible-collections/community.general/pull/6980).

4
plugins/module_utils/proxmox.py
View file

@ -72,8 +72,8 @@ class ProxmoxAnsible(object):
module.fail_json(msg=missing_required_lib('proxmoxer'), exception=PROXMOXER_IMP_ERR) module.fail_json(msg=missing_required_lib('proxmoxer'), exception=PROXMOXER_IMP_ERR)
self.module = module self.module = module
self.proxmox_api = self._connect()
self.proxmoxer_version = proxmoxer_version self.proxmoxer_version = proxmoxer_version
self.proxmox_api = self._connect()
# Test token validity # Test token validity
try: try:
self.proxmox_api.version.get() self.proxmox_api.version.get()
@ -92,7 +92,7 @@ class ProxmoxAnsible(object):
if api_password: if api_password:
auth_args['password'] = api_password auth_args['password'] = api_password
else: else:
if self.version() < LooseVersion('1.1.0'): if self.proxmoxer_version < LooseVersion('1.1.0'):
self.module.fail_json('Using "token_name" and "token_value" require proxmoxer>=1.1.0') self.module.fail_json('Using "token_name" and "token_value" require proxmoxer>=1.1.0')
auth_args['token_name'] = api_token_id auth_args['token_name'] = api_token_id
auth_args['token_value'] = api_token_secret auth_args['token_value'] = api_token_secret