From efa7ebb8a5b0f14ab340c908548f5ef4390b8266 Mon Sep 17 00:00:00 2001 From: Ondra Machacek Date: Fri, 13 Apr 2018 11:54:18 +0200 Subject: [PATCH] ovirt_disks: Fix fail condition for LUN disk (#38726) Fixes: https://github.com/ansible/ansible/issues/38661 --- lib/ansible/modules/cloud/ovirt/ovirt_disk.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/ansible/modules/cloud/ovirt/ovirt_disk.py b/lib/ansible/modules/cloud/ovirt/ovirt_disk.py index 214ce16c85..e95251e7bf 100644 --- a/lib/ansible/modules/cloud/ovirt/ovirt_disk.py +++ b/lib/ansible/modules/cloud/ovirt/ovirt_disk.py @@ -529,7 +529,7 @@ class DisksModule(BaseModule): def _update_check(self, entity): return ( equal(self._module.params.get('description'), entity.description) and - equal(self.param('quota_id'), getattr(entity.quota, 'id')) and + equal(self.param('quota_id'), getattr(entity.quota, 'id', None)) and equal(convert_to_bytes(self._module.params.get('size')), entity.provisioned_size) and equal(self._module.params.get('shareable'), entity.shareable) ) @@ -617,7 +617,7 @@ def main(): ret = disks_module.create( entity=disk, result_state=otypes.DiskStatus.OK if lun is None else None, - fail_condition=lambda d: d.status == otypes.DiskStatus.ILLEGAL, + fail_condition=lambda d: d.status == otypes.DiskStatus.ILLEGAL if lun is None else False, ) is_new_disk = ret['changed'] ret['changed'] = ret['changed'] or disks_module.update_storage_domains(ret['id'])