From 73cfe2f3c7a22b308ae5783de626d0e82e5a46b2 Mon Sep 17 00:00:00 2001
From: Sergei Antipov <greendayonfire@gmail.com>
Date: Tue, 2 Jun 2015 22:29:19 +0600
Subject: [PATCH] proxmox_template | deleted state=list and changed default
 timeout to 30

---
 .../extras/cloud/misc/proxmox_template.py     | 23 ++++---------------
 1 file changed, 5 insertions(+), 18 deletions(-)

diff --git a/lib/ansible/modules/extras/cloud/misc/proxmox_template.py b/lib/ansible/modules/extras/cloud/misc/proxmox_template.py
index 4bf71f62b1..7fed47f726 100644
--- a/lib/ansible/modules/extras/cloud/misc/proxmox_template.py
+++ b/lib/ansible/modules/extras/cloud/misc/proxmox_template.py
@@ -19,7 +19,7 @@ DOCUMENTATION = '''
 module: proxmox_template
 short_description: management of OS templates in Proxmox VE cluster
 description:
-  - allows you to list/upload/delete templates in Proxmox VE cluster
+  - allows you to upload/delete templates in Proxmox VE cluster
 version_added: "2.0"
 options:
   api_host:
@@ -76,7 +76,7 @@ options:
   timeout:
     description:
       - timeout for operations
-    default: 300
+    default: 30
     required: false
     type: integer
   force:
@@ -88,7 +88,7 @@ options:
   state:
     description:
      - Indicate desired state of the template
-    choices: ['present', 'absent', 'list']
+    choices: ['present', 'absent']
     default: present
 notes:
   - Requires proxmoxer and requests modules on host. This modules can be installed with pip.
@@ -108,9 +108,6 @@ EXAMPLES = '''
 
 # Delete template with minimal options
 - proxmox_template: node='uk-mc02' api_user='root@pam' api_password='1q2w3e' api_host='node1' template='ubuntu-14.04-x86_64.tar.gz' state=absent
-
-# List content of storage(it returns list of dicts)
-- proxmox_template: node='uk-mc02' api_user='root@pam' api_password='1q2w3e' api_host='node1' storage='local' state=list
 '''
 
 import os
@@ -126,9 +123,6 @@ def get_template(proxmox, node, storage, content_type, template):
   return [ True for tmpl in proxmox.nodes(node).storage(storage).content.get()
           if tmpl['volid'] == '%s:%s/%s' % (storage, content_type, template) ]
 
-def get_content(proxmox, node, storage):
-  return proxmox.nodes(node).storage(storage).content.get()
-
 def upload_template(module, proxmox, api_host, node, storage, content_type, realpath, timeout):
   taskid = proxmox.nodes(node).storage(storage).upload.post(content=content_type, filename=open(realpath))
   while timeout:
@@ -168,9 +162,9 @@ def main():
       template = dict(),
       content_type = dict(default='vztmpl', choices=['vztmpl','iso']),
       storage = dict(default='local'),
-      timeout = dict(type='int', default=300),
+      timeout = dict(type='int', default=30),
       force = dict(type='bool', choices=BOOLEANS, default='no'),
-      state = dict(default='present', choices=['present', 'absent', 'list']),
+      state = dict(default='present', choices=['present', 'absent']),
     )
   )
 
@@ -233,13 +227,6 @@ def main():
     except Exception, e:
       module.fail_json(msg="deleting of template %s failed with exception: %s" % ( template, e ))
 
-  elif state == 'list':
-    try:
-
-      module.exit_json(changed=False, templates=get_content(proxmox, node, storage))
-    except Exception, e:
-      module.fail_json(msg="listing of templates %s failed with exception: %s" % ( template, e ))
-
 # import module snippets
 from ansible.module_utils.basic import *
 main()