diff options
| author | Martin Nečas <necas.marty@gmail.com> | 2020-06-17 20:02:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-17 11:02:34 -0700 |
| commit | 34e804a4f22c5d6f9cb5d537c4d9de9ce3886963 (patch) | |
| tree | 40be2e224baac54231e7fe6124e0d00dfcd890b0 | |
| parent | 23761b98801ff6891d38af32d961daba1baf1bce (diff) | |
| download | ansible-34e804a4f22c5d6f9cb5d537c4d9de9ce3886963.tar.gz | |
Backport: ovirt_disk force wait when uploading disk (#69943)
* ovirt_disk: force wait when uploading disk
* add changelog
| -rw-r--r-- | changelogs/fragments/69943-ovirt_disk-force-wait-when-uploading-disk.yml | 2 | ||||
| -rw-r--r-- | lib/ansible/modules/cloud/ovirt/ovirt_disk.py | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/changelogs/fragments/69943-ovirt_disk-force-wait-when-uploading-disk.yml b/changelogs/fragments/69943-ovirt_disk-force-wait-when-uploading-disk.yml new file mode 100644 index 0000000000..bc1a9f619e --- /dev/null +++ b/changelogs/fragments/69943-ovirt_disk-force-wait-when-uploading-disk.yml @@ -0,0 +1,2 @@ +bugfixes: +- "ovirt_disk: force wait when uploading disk" diff --git a/lib/ansible/modules/cloud/ovirt/ovirt_disk.py b/lib/ansible/modules/cloud/ovirt/ovirt_disk.py index 38322eb807..601c6fabdb 100644 --- a/lib/ansible/modules/cloud/ovirt/ovirt_disk.py +++ b/lib/ansible/modules/cloud/ovirt/ovirt_disk.py @@ -739,6 +739,7 @@ def main(): result_state=otypes.DiskStatus.OK if lun is None else None, fail_condition=lambda d: d.status == otypes.DiskStatus.ILLEGAL if lun is None else False, force_create=force_create, + _wait=True if module.params['upload_image_path'] else module.params['wait'], ) is_new_disk = ret['changed'] ret['changed'] = ret['changed'] or disks_module.update_storage_domains(ret['id']) |