From 01c6915eba32d77dbe82cf6ed88d105de63899b9 Mon Sep 17 00:00:00 2001
From: Mariusz Mazur <mmazur@redhat.com>
Date: Thu, 30 May 2019 19:16:02 +0200
Subject: [PATCH] Backport/2.8/57163 (#57173)

* kubevirt_pvc: improve failure handling (#57163)


(cherry picked from commit cac34ac56881e618d1c363a41858eef68f9761be)

* kubevirt_pvc: changelog fragment
---
 changelogs/fragments/kubevirt_pvc.yml              | 3 +++
 lib/ansible/modules/cloud/kubevirt/kubevirt_pvc.py | 2 ++
 2 files changed, 5 insertions(+)
 create mode 100644 changelogs/fragments/kubevirt_pvc.yml

diff --git a/changelogs/fragments/kubevirt_pvc.yml b/changelogs/fragments/kubevirt_pvc.yml
new file mode 100644
index 00000000000..c9cff4f9def
--- /dev/null
+++ b/changelogs/fragments/kubevirt_pvc.yml
@@ -0,0 +1,3 @@
+---
+bugfixes:
+  - Properly handle data importer failures on PVC creation, instead of timing out.
diff --git a/lib/ansible/modules/cloud/kubevirt/kubevirt_pvc.py b/lib/ansible/modules/cloud/kubevirt/kubevirt_pvc.py
index 6607150ab24..844a7ec7070 100644
--- a/lib/ansible/modules/cloud/kubevirt/kubevirt_pvc.py
+++ b/lib/ansible/modules/cloud/kubevirt/kubevirt_pvc.py
@@ -391,6 +391,8 @@ class KubevirtPVC(KubernetesRawModule):
                     if import_status == desired_cdi_status:
                         return_obj = entity
                         break
+                    elif import_status == 'Failed':
+                        raise CreatePVCFailed("PVC creation incomplete; importing data failed")
                 else:
                     return_obj = entity
                     break