mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
* fixing onboot parameter when not supplied
* adding changelog fragment
(cherry picked from commit 00a1152bb1
)
Co-authored-by: Andrew Pantuso <ajpantuso@gmail.com>
This commit is contained in:
parent
5d6fcaef53
commit
130d07948a
3 changed files with 22 additions and 3 deletions
4
changelogs/fragments/3874-proxmox-fix-onboot-param.yml
Normal file
4
changelogs/fragments/3874-proxmox-fix-onboot-param.yml
Normal file
|
@ -0,0 +1,4 @@
|
||||||
|
---
|
||||||
|
bugfixes:
|
||||||
|
- proxmox - fixed ``onboot`` parameter causing module failures when undefined
|
||||||
|
(https://github.com/ansible-collections/community.general/issues/3844).
|
|
@ -54,6 +54,17 @@ def proxmox_to_ansible_bool(value):
|
||||||
return True if value == 1 else False
|
return True if value == 1 else False
|
||||||
|
|
||||||
|
|
||||||
|
def ansible_to_proxmox_bool(value):
|
||||||
|
'''Convert Ansible representation of a boolean to be proxmox-friendly'''
|
||||||
|
if value is None:
|
||||||
|
return None
|
||||||
|
|
||||||
|
if not isinstance(value, bool):
|
||||||
|
raise ValueError("%s must be of type bool not %s" % (value, type(value)))
|
||||||
|
|
||||||
|
return 1 if value else 0
|
||||||
|
|
||||||
|
|
||||||
class ProxmoxAnsible(object):
|
class ProxmoxAnsible(object):
|
||||||
"""Base class for Proxmox modules"""
|
"""Base class for Proxmox modules"""
|
||||||
def __init__(self, module):
|
def __init__(self, module):
|
||||||
|
|
|
@ -359,6 +359,10 @@ except ImportError:
|
||||||
from ansible.module_utils.basic import AnsibleModule, env_fallback
|
from ansible.module_utils.basic import AnsibleModule, env_fallback
|
||||||
from ansible.module_utils.common.text.converters import to_native
|
from ansible.module_utils.common.text.converters import to_native
|
||||||
|
|
||||||
|
from ansible_collections.community.general.plugins.module_utils.proxmox import (
|
||||||
|
ansible_to_proxmox_bool
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
VZ_TYPE = None
|
VZ_TYPE = None
|
||||||
|
|
||||||
|
@ -605,14 +609,14 @@ def main():
|
||||||
netif=module.params['netif'],
|
netif=module.params['netif'],
|
||||||
mounts=module.params['mounts'],
|
mounts=module.params['mounts'],
|
||||||
ip_address=module.params['ip_address'],
|
ip_address=module.params['ip_address'],
|
||||||
onboot=int(module.params['onboot']),
|
onboot=ansible_to_proxmox_bool(module.params['onboot']),
|
||||||
cpuunits=module.params['cpuunits'],
|
cpuunits=module.params['cpuunits'],
|
||||||
nameserver=module.params['nameserver'],
|
nameserver=module.params['nameserver'],
|
||||||
searchdomain=module.params['searchdomain'],
|
searchdomain=module.params['searchdomain'],
|
||||||
force=int(module.params['force']),
|
force=ansible_to_proxmox_bool(module.params['force']),
|
||||||
pubkey=module.params['pubkey'],
|
pubkey=module.params['pubkey'],
|
||||||
features=",".join(module.params['features']) if module.params['features'] is not None else None,
|
features=",".join(module.params['features']) if module.params['features'] is not None else None,
|
||||||
unprivileged=int(module.params['unprivileged']),
|
unprivileged=ansible_to_proxmox_bool(module.params['unprivileged']),
|
||||||
description=module.params['description'],
|
description=module.params['description'],
|
||||||
hookscript=module.params['hookscript'])
|
hookscript=module.params['hookscript'])
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue