From e2160095a12e4bb522e69f1006eb12dff4c5b591 Mon Sep 17 00:00:00 2001
From: "Z. Cliffe Schreuders" <code.cliffe@schreuders.org>
Date: Wed, 15 Sep 2021 17:24:06 +0100
Subject: [PATCH] ovirt base updates

---
 .../secgen_metadata.xml                       |  2 +-
 .../debian_stretch_server/secgen_metadata.xml |  5 ++--
 modules/bases/kali_light/secgen_metadata.xml  | 27 -------------------
 3 files changed, 4 insertions(+), 30 deletions(-)
 delete mode 100644 modules/bases/kali_light/secgen_metadata.xml

diff --git a/modules/bases/debian_stretch_desktop_kde/secgen_metadata.xml b/modules/bases/debian_stretch_desktop_kde/secgen_metadata.xml
index 8a9d61900..0470f174c 100644
--- a/modules/bases/debian_stretch_desktop_kde/secgen_metadata.xml
+++ b/modules/bases/debian_stretch_desktop_kde/secgen_metadata.xml
@@ -15,7 +15,7 @@
   <distro>Debian 9.5.0 Stretch amd64</distro>
   <url>https://app.vagrantup.com/secgen/boxes/debian_stretch_desktop_kde/versions/1.2/providers/virtualbox.box</url>
   <esxi_url>https://app.vagrantup.com/redwiz666/boxes/debian_stretch_desktop_kde/versions/1.0.0/providers/vmware.box</esxi_url>
-  <ovirt_template>stretch_desktop_kde_20210519</ovirt_template>
+  <ovirt_template>stretch_desktop_kde_20210911</ovirt_template>
 
   <reference>https://atlas.hashicorp.com/puppetlabs</reference>
   <software_license>various</software_license>
diff --git a/modules/bases/debian_stretch_server/secgen_metadata.xml b/modules/bases/debian_stretch_server/secgen_metadata.xml
index 178ed976f..337b826da 100644
--- a/modules/bases/debian_stretch_server/secgen_metadata.xml
+++ b/modules/bases/debian_stretch_server/secgen_metadata.xml
@@ -16,10 +16,11 @@
   <distro>Debian 9.5.0 Stretch amd64</distro>
   <url>https://app.vagrantup.com/secgen/boxes/debian_stretch_server/versions/1.3/providers/virtualbox.box</url>
   <esxi_url>https://app.vagrantup.com/redwiz666/boxes/debian_stretch_server/versions/1.0.0/providers/vmware.box</esxi_url>
-  <ovirt_template>debian_stretch_server_291118</ovirt_template>
+  <!-- use the ovirt kde template even for servers, so there are less bases to maintain -->
+  <ovirt_template>stretch_desktop_kde_20210911</ovirt_template>
 
   <software_license>various</software_license>
-  
+
   <!-- another base should not be added to this base -->
   <conflict>
     <module_path>bases/.*</module_path>
diff --git a/modules/bases/kali_light/secgen_metadata.xml b/modules/bases/kali_light/secgen_metadata.xml
deleted file mode 100644
index dab0861da..000000000
--- a/modules/bases/kali_light/secgen_metadata.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0"?>
-
-<base xmlns="http://www.github/cliffe/SecGen/base"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://www.github/cliffe/SecGen/base">
-  <name>Kali Light and Puppet</name>
-  <author>Z. Cliffe Schreuders</author>
-  <module_license>GPLv3</module_license>
-  <description>Kali Light 2018.3 with puppet.</description>
-  <cpu_word_size>64-bit</cpu_word_size>
-  <type>attack</type>
-  <type>desktop</type>
-
-  <platform>linux</platform>
-  <platform>unix</platform>
-  <distro>Kali Linux 2018.3</distro>
-  <url>https://app.vagrantup.com/secgen/boxes/kali_light/versions/1.0/providers/virtualbox.box</url>
-  <esxi_url>https://app.vagrantup.com/redwiz666/boxes/kali_light/versions/1.0.0/providers/vmware.box</esxi_url>
-
-  <reference>https://app.vagrantup.com/secgen</reference>
-  <software_license>various</software_license>
-
-  <!-- another base should not be added to this base -->
-  <conflict>
-    <module_path>bases/.*</module_path>
-  </conflict>
-</base>