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

cloudstack: ensure we select a template compatible with disksize (#21058)

Browse source 
When the user specify a root disk size, the template image must be
smaller than the specified root disk size.
This commit is contained in:
Vincent Bernat 2017-02-06 23:14:31 +01:00 committed by René Moser
parent 375846d764
commit d94f9bdd8d
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/ansible/modules/cloud/cloudstack/cs_instance.py
View file

@ -477,14 +477,20 @@ class AnsibleCloudStackInstance(AnsibleCloudStack):
if self.template: if self.template:
return self._get_by_key(key, self.template) return self._get_by_key(key, self.template)
rootdisksize = self.module.params.get('root_disk_size')
args['templatefilter'] = self.module.params.get('template_filter') args['templatefilter'] = self.module.params.get('template_filter')
templates = self.cs.listTemplates(**args) templates = self.cs.listTemplates(**args)
if templates: if templates:
for t in templates['template']: for t in templates['template']:
if template in [ t['displaytext'], t['name'], t['id'] ]: if template in [ t['displaytext'], t['name'], t['id'] ]:
if rootdisksize and t['size'] > rootdisksize*1024**3:
continue
self.template = t self.template = t
return self._get_by_key(key, self.template) return self._get_by_key(key, self.template)
self.module.fail_json(msg="Template '%s' not found" % template) more_info = ""
if rootdisksize:
more_info = " (with size <= %s)" % rootdisksize
self.module.fail_json(msg="Template '%s' not found%s" % (template, more_info))
elif iso: elif iso:
if self.iso: if self.iso: