Blame SOURCES/0011-v2v-OVF-fix-ovf-id-for-VirtualSystem-in-OVirt-flavou.patch
|
 |
d0ea73 |
From b96a2119b20f204661fa2165aea3c6c2b84e23de Mon Sep 17 00:00:00 2001
|
|
|
d0ea73 |
From: Pino Toscano <ptoscano@redhat.com>
|
|
|
d0ea73 |
Date: Thu, 5 Apr 2018 10:28:17 +0200
|
|
|
d0ea73 |
Subject: [PATCH] v2v: OVF: fix ovf:id for VirtualSystem in OVirt flavour
|
|
|
d0ea73 |
|
|
|
d0ea73 |
When writing the OVF in OVirt flavour, write the actual UUID of the
|
|
|
d0ea73 |
VM as ovf:id attribute for <VirtualSystem>, instead of a dummy value.
|
|
|
d0ea73 |
|
|
|
d0ea73 |
Suggested by Arik Hadas in
|
|
|
d0ea73 |
https://www.redhat.com/archives/libguestfs/2018-April/msg00005.html
|
|
|
d0ea73 |
|
|
|
d0ea73 |
(cherry picked from commit 9dce43931a19510be1b6d21ce67d14a4136ce241)
|
|
|
d0ea73 |
---
|
|
|
d0ea73 |
v2v/create_ovf.ml | 2 +-
|
|
|
d0ea73 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
d0ea73 |
|
|
|
d0ea73 |
diff --git a/v2v/create_ovf.ml b/v2v/create_ovf.ml
|
|
|
d0ea73 |
index 730ab64b4..b1ab8df3f 100644
|
|
|
d0ea73 |
--- a/v2v/create_ovf.ml
|
|
|
d0ea73 |
+++ b/v2v/create_ovf.ml
|
|
|
d0ea73 |
@@ -688,7 +688,7 @@ let rec create_ovf source targets guestcaps inspect
|
|
|
d0ea73 |
|
|
|
d0ea73 |
(match ovf_flavour with
|
|
|
d0ea73 |
| OVirt ->
|
|
|
d0ea73 |
- e "VirtualSystem" ["ovf:id", "out"] !content_subnodes
|
|
|
d0ea73 |
+ e "VirtualSystem" ["ovf:id", vm_uuid] !content_subnodes
|
|
|
d0ea73 |
| RHVExportStorageDomain ->
|
|
|
d0ea73 |
e "Content" ["ovf:id", "out"; "xsi:type", "ovf:VirtualSystem_Type"]
|
|
|
d0ea73 |
!content_subnodes
|
|
|
d0ea73 |
--
|
|
 |
6b9fda |
2.21.0
|
|
|
d0ea73 |
|