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

cloudstack: fix cs_instance can not find iso and disk offering if domain is set.

Browse source 
This does only affect root admins.
This commit is contained in:
Rene Moser 2015-06-26 09:39:53 +02:00 committed by Matt Clay
parent 0399d40895
commit da3db1bfda
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/ansible/modules/extras/cloud/cloudstack/cs_instance.py
View file

@ -388,6 +388,7 @@ class AnsibleCloudStackInstance(AnsibleCloudStack):
args['domainid'] = self.get_domain('id') args['domainid'] = self.get_domain('id')
args['projectid'] = self.get_project('id') args['projectid'] = self.get_project('id')
args['zoneid'] = self.get_zone('id') args['zoneid'] = self.get_zone('id')
args['isrecursive'] = True
if template: if template:
if self.template: if self.template:
@ -421,10 +422,7 @@ class AnsibleCloudStackInstance(AnsibleCloudStack):
if not disk_offering: if not disk_offering:
return None return None
args = {} disk_offerings = self.cs.listDiskOfferings()
args['domainid'] = self.get_domain('id')
disk_offerings = self.cs.listDiskOfferings(**args)
if disk_offerings: if disk_offerings:
for d in disk_offerings['diskoffering']: for d in disk_offerings['diskoffering']:
if disk_offering in [ d['displaytext'], d['name'], d['id'] ]: if disk_offering in [ d['displaytext'], d['name'], d['id'] ]: