mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
* Adding tags as module parameter
* Added changelog fragment
* Correcting typo in changelog fragment
* Correcting punctuation in docs
* Including version to tags parameter description
Co-authored-by: Felix Fontein <felix@fontein.de>
* Correct tag validation and parsing logic condition
Original test was for key and not value
Co-authored-by: Felix Fontein <felix@fontein.de>
* Improving usability with default null behavior
* Removing default case and related unneccessary complexity
* Display regex in tags description as code
Co-authored-by: Felix Fontein <felix@fontein.de>
Co-authored-by: Felix Fontein <felix@fontein.de>
(cherry picked from commit 0f61ae4841
)
Co-authored-by: Ajpantuso <ajpantuso@gmail.com>
This commit is contained in:
parent
466bd89bd4
commit
13a5e5a1ba
2 changed files with 21 additions and 1 deletions
3
changelogs/fragments/2000-proxmox_kvm-tag-support.yml
Normal file
3
changelogs/fragments/2000-proxmox_kvm-tag-support.yml
Normal file
|
@ -0,0 +1,3 @@
|
||||||
|
---
|
||||||
|
minor_changes:
|
||||||
|
- proxmox_kvm - added new module parameter ``tags`` for use with PVE 6+ (https://github.com/ansible-collections/community.general/pull/2000).
|
|
@ -425,6 +425,14 @@ options:
|
||||||
option has a default of C(no). Note that the default value of I(proxmox_default_behavior)
|
option has a default of C(no). Note that the default value of I(proxmox_default_behavior)
|
||||||
changes in community.general 4.0.0.
|
changes in community.general 4.0.0.
|
||||||
type: bool
|
type: bool
|
||||||
|
tags:
|
||||||
|
description:
|
||||||
|
- List of tags to apply to the VM instance.
|
||||||
|
- Tags must start with C([a-z0-9_]) followed by zero or more of the following characters C([a-z0-9_-+.]).
|
||||||
|
- Tags are only available in Proxmox 6+.
|
||||||
|
type: list
|
||||||
|
elements: str
|
||||||
|
version_added: 2.3.0
|
||||||
target:
|
target:
|
||||||
description:
|
description:
|
||||||
- Target node. Only allowed if the original VM is on shared storage.
|
- Target node. Only allowed if the original VM is on shared storage.
|
||||||
|
@ -858,7 +866,7 @@ def wait_for_task(module, proxmox, node, taskid):
|
||||||
def create_vm(module, proxmox, vmid, newid, node, name, memory, cpu, cores, sockets, update, **kwargs):
|
def create_vm(module, proxmox, vmid, newid, node, name, memory, cpu, cores, sockets, update, **kwargs):
|
||||||
# Available only in PVE 4
|
# Available only in PVE 4
|
||||||
only_v4 = ['force', 'protection', 'skiplock']
|
only_v4 = ['force', 'protection', 'skiplock']
|
||||||
only_v6 = ['ciuser', 'cipassword', 'sshkeys', 'ipconfig']
|
only_v6 = ['ciuser', 'cipassword', 'sshkeys', 'ipconfig', 'tags']
|
||||||
|
|
||||||
# valide clone parameters
|
# valide clone parameters
|
||||||
valid_clone_params = ['format', 'full', 'pool', 'snapname', 'storage', 'target']
|
valid_clone_params = ['format', 'full', 'pool', 'snapname', 'storage', 'target']
|
||||||
|
@ -928,6 +936,13 @@ def create_vm(module, proxmox, vmid, newid, node, name, memory, cpu, cores, sock
|
||||||
if searchdomains:
|
if searchdomains:
|
||||||
kwargs['searchdomain'] = ' '.join(searchdomains)
|
kwargs['searchdomain'] = ' '.join(searchdomains)
|
||||||
|
|
||||||
|
# VM tags are expected to be valid and presented as a comma/semi-colon delimited string
|
||||||
|
if 'tags' in kwargs:
|
||||||
|
for tag in kwargs['tags']:
|
||||||
|
if not re.match(r'^[a-z0-9_][a-z0-9_\-\+\.]*$', tag):
|
||||||
|
module.fail_json(msg='%s is not a valid tag' % tag)
|
||||||
|
kwargs['tags'] = ",".join(kwargs['tags'])
|
||||||
|
|
||||||
# -args and skiplock require root@pam user - but can not use api tokens
|
# -args and skiplock require root@pam user - but can not use api tokens
|
||||||
if module.params['api_user'] == "root@pam" and module.params['args'] is None:
|
if module.params['api_user'] == "root@pam" and module.params['args'] is None:
|
||||||
if not update and module.params['proxmox_default_behavior'] == 'compatibility':
|
if not update and module.params['proxmox_default_behavior'] == 'compatibility':
|
||||||
|
@ -1063,6 +1078,7 @@ def main():
|
||||||
state=dict(default='present', choices=['present', 'absent', 'stopped', 'started', 'restarted', 'current']),
|
state=dict(default='present', choices=['present', 'absent', 'stopped', 'started', 'restarted', 'current']),
|
||||||
storage=dict(type='str'),
|
storage=dict(type='str'),
|
||||||
tablet=dict(type='bool'),
|
tablet=dict(type='bool'),
|
||||||
|
tags=dict(type='list', elements='str'),
|
||||||
target=dict(type='str'),
|
target=dict(type='str'),
|
||||||
tdf=dict(type='bool'),
|
tdf=dict(type='bool'),
|
||||||
template=dict(type='bool'),
|
template=dict(type='bool'),
|
||||||
|
@ -1267,6 +1283,7 @@ def main():
|
||||||
startdate=module.params['startdate'],
|
startdate=module.params['startdate'],
|
||||||
startup=module.params['startup'],
|
startup=module.params['startup'],
|
||||||
tablet=module.params['tablet'],
|
tablet=module.params['tablet'],
|
||||||
|
tags=module.params['tags'],
|
||||||
target=module.params['target'],
|
target=module.params['target'],
|
||||||
tdf=module.params['tdf'],
|
tdf=module.params['tdf'],
|
||||||
template=module.params['template'],
|
template=module.params['template'],
|
||||||
|
|
Loading…
Reference in a new issue