move <ovirt_template> next to basebox url in metadata and schema

This commit is contained in:
thomashaw
2017-10-05 11:49:59 +01:00
parent 2a7229e6fa
commit 7abaabe9b6
3 changed files with 3 additions and 1 deletions

View File

@@ -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">

View File

@@ -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>

View File

@@ -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>