From 77eb3f197e146a8c396006373ddbba10649a1f87 Mon Sep 17 00:00:00 2001 From: mnecas Date: Tue, 15 Sep 2020 17:02:48 +0200 Subject: [PATCH 1/2] ovirt_disk: fix upload when direct upload fails --- plugins/modules/ovirt_disk.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/modules/ovirt_disk.py b/plugins/modules/ovirt_disk.py index d2bed4e0..807f1b73 100644 --- a/plugins/modules/ovirt_disk.py +++ b/plugins/modules/ovirt_disk.py @@ -404,7 +404,7 @@ def create_transfer_connection(module, transfer, context, connect_timeout=10, re url.netloc, context=context, timeout=connect_timeout) try: connection.connect() - except OSError as e: + except Exception as e: # Typically ConnectionRefusedError or socket.gaierror. module.warn("Cannot connect to %s, trying %s: %s" % (transfer.transfer_url, transfer.proxy_url, e)) From 1ba9288e90335cc7273ef4660476245d169c351a Mon Sep 17 00:00:00 2001 From: mnecas Date: Wed, 16 Sep 2020 09:09:15 +0200 Subject: [PATCH 2/2] add fragment --- .../ovirt_disk-fix-upload-when-direct-upload-fails.yml | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 changelogs/fragments/ovirt_disk-fix-upload-when-direct-upload-fails.yml diff --git a/changelogs/fragments/ovirt_disk-fix-upload-when-direct-upload-fails.yml b/changelogs/fragments/ovirt_disk-fix-upload-when-direct-upload-fails.yml new file mode 100644 index 00000000..80bd192b --- /dev/null +++ b/changelogs/fragments/ovirt_disk-fix-upload-when-direct-upload-fails.yml @@ -0,0 +1,3 @@ +--- +bugfixes: + - ovirt_disk - fix upload when direct upload fails (https://github.com/oVirt/ovirt-ansible-collection/pull/120).