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

fix merge conflicts (#19481)

pull/4420/head
DavidVentura 2017-02-09 09:55:25 -03:00 committed by John R Barker
parent 1a28a48176
commit c5a8b78956
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/ansible/modules/cloud/misc/proxmox.py
View File

@ -180,6 +180,11 @@ options:
- Public key to add to /root/.ssh/authorized_keys. This was added on Proxmox 4.2, it is ignored for earlier versions - Public key to add to /root/.ssh/authorized_keys. This was added on Proxmox 4.2, it is ignored for earlier versions
version_added: "2.3" version_added: "2.3"
default: null default: null
unprivileged:
version_added: "2.3"
description:
- Indicate if the container should be unprivileged
default: false
required: false required: false
notes: notes:
@ -441,7 +446,8 @@ def main():
timeout = dict(type='int', default=30), timeout = dict(type='int', default=30),
force = dict(type='bool', default='no'), force = dict(type='bool', default='no'),
state = dict(default='present', choices=['present', 'absent', 'stopped', 'started', 'restarted']), state = dict(default='present', choices=['present', 'absent', 'stopped', 'started', 'restarted']),
pubkey = dict(type='str', default=None) pubkey = dict(type='str', default=None),
unprivileged = dict(type='bool', default='no')
) )
) )
@ -517,8 +523,8 @@ def main():
nameserver = module.params['nameserver'], nameserver = module.params['nameserver'],
searchdomain = module.params['searchdomain'], searchdomain = module.params['searchdomain'],
force = int(module.params['force']), force = int(module.params['force']),
pubkey = module.params['pubkey'] pubkey = module.params['pubkey'],
) unprivileged = int(module.params['unprivileged']))
module.exit_json(changed=True, msg="deployed VM %s from template %s" % (vmid, module.params['ostemplate'])) module.exit_json(changed=True, msg="deployed VM %s from template %s" % (vmid, module.params['ostemplate']))
except Exception as e: except Exception as e: