|
|
@ -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'] ]:
|
|
|
|