From c5a8b7895621c081b0306f4fd30dbbccae594b98 Mon Sep 17 00:00:00 2001 From: DavidVentura Date: Thu, 9 Feb 2017 09:55:25 -0300 Subject: [PATCH] fix merge conflicts (#19481) --- lib/ansible/modules/cloud/misc/proxmox.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/lib/ansible/modules/cloud/misc/proxmox.py b/lib/ansible/modules/cloud/misc/proxmox.py index 5b507b495d..a6d428f92f 100644 --- a/lib/ansible/modules/cloud/misc/proxmox.py +++ b/lib/ansible/modules/cloud/misc/proxmox.py @@ -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 version_added: "2.3" default: null + unprivileged: + version_added: "2.3" + description: + - Indicate if the container should be unprivileged + default: false required: false notes: @@ -441,7 +446,8 @@ def main(): timeout = dict(type='int', default=30), force = dict(type='bool', default='no'), 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'], searchdomain = module.params['searchdomain'], 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'])) except Exception as e: