From f9c8feb09cca1ce34ef05f3dce7a78f3289385f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kai=20L=C3=BCke?= <kai@kinvolk.io>
Date: Mon, 9 Mar 2020 16:58:05 +0100
Subject: [PATCH] build_library/template_vmware.ovf: Use Ignition OVF vars

For the Ignition variables to be usable they need to be
specified in the OVF.
Call out that the CoreOS variables are deprecated to
reduce confusion when both are displayed besides each other.
---
 build_library/template_vmware.ovf | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/build_library/template_vmware.ovf b/build_library/template_vmware.ovf
index 0142bb2a5b..02fd50bb37 100644
--- a/build_library/template_vmware.ovf
+++ b/build_library/template_vmware.ovf
@@ -17,7 +17,7 @@
     <Info>A virtual machine</Info>
     <Name>@@NAME@@</Name>
     <ProductSection ovf:required="false">
-      <Info>CoreOS Virtual Appliance</Info>
+      <Info>Flatcar Container Linux Virtual Appliance</Info>
       <Property ovf:userConfigurable="true" ovf:type="string"
                 ovf:key="guestinfo.hostname" ovf:value="">
         <Label>Hostname</Label>
@@ -25,19 +25,34 @@
       </Property>
       <Property ovf:userConfigurable="true" ovf:type="string"
                 ovf:key="guestinfo.coreos.config.data" ovf:value="">
-        <Label>CoreOS config data</Label>
+        <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</Label>
+        <Label>CoreOS config url (deprecated)</Label>
         <Description>URL to cloud-config data</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</Label>
+        <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>