cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #2689 from tsmolka/patch1

Browse source 
Making cluster parameter optional
This commit is contained in:
Chrrrles Paul 2015-12-15 14:32:44 -06:00
commit e252fffb92
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cloud/vmware/vsphere_guest.py
View file

@ -656,7 +656,7 @@ def deploy_template(vsphere_client, guest, resource_pool, template_src, esxi, mo
elif resource_pool: elif resource_pool:
try: try:
cluster = [k for k, cluster = [k for k,
v in vsphere_client.get_clusters().items() if v == cluster_name][0] v in vsphere_client.get_clusters().items() if v == cluster_name][0] if cluster_name else None
except IndexError, e: except IndexError, e:
vsphere_client.disconnect() vsphere_client.disconnect()
module.fail_json(msg="Cannot find Cluster named: %s" % module.fail_json(msg="Cannot find Cluster named: %s" %
@ -1059,7 +1059,7 @@ def create_vm(vsphere_client, module, esxi, resource_pool, cluster_name, guest,
if resource_pool: if resource_pool:
try: try:
cluster = [k for k, cluster = [k for k,
v in vsphere_client.get_clusters().items() if v == cluster_name][0] v in vsphere_client.get_clusters().items() if v == cluster_name][0] if cluster_name else None
except IndexError, e: except IndexError, e:
vsphere_client.disconnect() vsphere_client.disconnect()
module.fail_json(msg="Cannot find Cluster named: %s" % module.fail_json(msg="Cannot find Cluster named: %s" %