From 42cf3423d4930eb37b6777056ae390b648309ad8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kai=20L=C3=BCke?= <kai@kinvolk.io>
Date: Fri, 17 Apr 2020 15:40:20 +0200
Subject: [PATCH] build_library/template_vmware.ovf: Remove old CoreOS OVF
 variables

There was a logical mistake in Ignition that caused ignition.config.*
only to work when it was part of the ovfenv. Thus they were added but
the old CoreOS variables marked deprecated and kept. With both as OVF
variables each of them worked but directly specifying ignition.config.*
as guest variable still didn't because of the logical mistake.
Now there is a fix and both work well when specified directly as guest
variable (https://github.com/flatcar-linux/ignition/pull/11).
Delete the old CoreOS OVF variables because they just clutter the UI
and only the Ignition variables should be used in the UI.
---
 build_library/template_vmware.ovf | 21 +++------------------
 1 file changed, 3 insertions(+), 18 deletions(-)

diff --git a/build_library/template_vmware.ovf b/build_library/template_vmware.ovf
index 02fd50bb37..8a60ddf220 100644
--- a/build_library/template_vmware.ovf
+++ b/build_library/template_vmware.ovf
@@ -23,36 +23,21 @@
         <Label>Hostname</Label>
         <Description>Hostname</Description>
       </Property>
-      <Property ovf:userConfigurable="true" ovf:type="string"
-                ovf:key="guestinfo.coreos.config.data" ovf:value="">
-        <Label>CoreOS config data (deprecated)</Label>
-        <Description>Inline cloud-config data</Description>
-      </Property>
       <Property ovf:userConfigurable="true" ovf:type="string"
                 ovf:key="guestinfo.ignition.config.data" ovf:value="">
         <Label>Ignition config data</Label>
         <Description>Inline Ignition data</Description>
       </Property>
       <Property ovf:userConfigurable="true" ovf:type="string"
-                ovf:key="guestinfo.coreos.config.url" ovf:value="">
-        <Label>CoreOS config url (deprecated)</Label>
-        <Description>URL to cloud-config data</Description>
+                ovf:key="guestinfo.ignition.config.data.encoding" ovf:value="">
+        <Label>Ignition config data encoding</Label>
+        <Description>Encoding for Ignition data (e.g., base64)</Description>
       </Property>
       <Property ovf:userConfigurable="true" ovf:type="string"
                 ovf:key="guestinfo.ignition.config.url" ovf:value="">
         <Label>Ignition config url</Label>
         <Description>URL to Ignition data</Description>
       </Property>
-      <Property ovf:userConfigurable="true" ovf:type="string"
-                ovf:key="guestinfo.coreos.config.data.encoding" ovf:value="">
-        <Label>CoreOS config data encoding (deprecated)</Label>
-        <Description>Encoding for cloud-config data</Description>
-      </Property>
-      <Property ovf:userConfigurable="true" ovf:type="string"
-                ovf:key="guestinfo.ignition.config.data.encoding" ovf:value="">
-        <Label>Ignition config data encoding</Label>
-        <Description>Encoding for Ignition data (e.g., base64)</Description>
-      </Property>
       <Property ovf:userConfigurable="true" ovf:type="string"
                 ovf:key="guestinfo.interface.0.name" ovf:value="">
         <Label>Name for network interface 0</Label>