a-c-m
/
community.general
mirror of https://github.com/ansible-collections/community.general.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[PR #6980/796ad356 backport][stable-7] [proxmox] Use proxmoxer_version instead of server API version (#6982) 

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

* Use proxmoxer_version instead of server API version

* Add changelog fragment

(cherry picked from commit 796ad3565e)

Co-authored-by: Sergei Antipov <greendayonfire@gmail.com>
pull/6992/head
patchback[bot] 2023-07-21 17:03:41 +02:00 committed by GitHub
parent 8eb94dc36b
commit f003833c1a
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

@ -80,8 +80,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()
@ -100,7 +100,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