From 7abaabe9b64fc7d0a5e50a7123f6377998f25fa5 Mon Sep 17 00:00:00 2001
From: thomashaw <thomashaw@gmail.com>
Date: Thu, 5 Oct 2017 11:49:59 +0100
Subject: [PATCH] move <ovirt_template> next to basebox url in metadata and
 schema

---
 lib/schemas/base_metadata_schema.xsd                        | 2 +-
 modules/bases/debian_wheezy_desktop_kde/secgen_metadata.xml | 1 +
 modules/bases/kali_light_msf/secgen_metadata.xml            | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/schemas/base_metadata_schema.xsd b/lib/schemas/base_metadata_schema.xsd
index 96d8df4fb..7eddfa286 100644
--- a/lib/schemas/base_metadata_schema.xsd
+++ b/lib/schemas/base_metadata_schema.xsd
@@ -50,6 +50,7 @@
         <xs:element name="platform" type="platformOptions" minOccurs="1" maxOccurs="unbounded"/>
         <xs:element name="distro" type="xs:string" minOccurs="1" maxOccurs="1"/>
         <xs:element name="url" type="xs:string" minOccurs="1" maxOccurs="1"/>
+        <xs:element name="ovirt_template" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
 
         <xs:element name="packerfile_path" type="xs:string" minOccurs="0" maxOccurs="1"/>
         <xs:element name="product_key" type="xs:string" minOccurs="0" maxOccurs="1"/>
@@ -58,7 +59,6 @@
         <xs:element name="reference" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
         <xs:element name="software_name" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
         <xs:element name="software_license" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-        <xs:element name="ovirt_template" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
 
         <!-- cannot co-exist with a system matching ALL of the optionally specified values (can be repeated for OR)-->
         <xs:element name="conflict" minOccurs="0" maxOccurs="unbounded">
diff --git a/modules/bases/debian_wheezy_desktop_kde/secgen_metadata.xml b/modules/bases/debian_wheezy_desktop_kde/secgen_metadata.xml
index dceef8f26..a73992247 100644
--- a/modules/bases/debian_wheezy_desktop_kde/secgen_metadata.xml
+++ b/modules/bases/debian_wheezy_desktop_kde/secgen_metadata.xml
@@ -16,6 +16,7 @@
   <platform>unix</platform>
   <distro>Debian 7.8 (wheezy) 32-bit (i386)</distro>
   <url>https://app.vagrantup.com/secgen/boxes/debian_wheezy_kde_puppet/versions/1.0.0/providers/virtualbox.box</url>
+  <ovirt_template>debian_desktop_kde</ovirt_template>
 
   <reference>https://atlas.hashicorp.com/puppetlabs</reference>
   <software_license>various</software_license>
diff --git a/modules/bases/kali_light_msf/secgen_metadata.xml b/modules/bases/kali_light_msf/secgen_metadata.xml
index 8abcd48d2..e1f081247 100644
--- a/modules/bases/kali_light_msf/secgen_metadata.xml
+++ b/modules/bases/kali_light_msf/secgen_metadata.xml
@@ -15,6 +15,7 @@
   <platform>unix</platform>
   <distro>Kali Linux 2017.1</distro>
   <url>https://app.vagrantup.com/secgen/boxes/kali_lite_msf_puppet/versions/1.0.1/providers/virtualbox.box</url>
+  <ovirt_template>kali_linux_msf</ovirt_template>
 
   <reference>https://app.vagrantup.com/cliffe</reference>
   <software_license>various</software_license>