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.
This commit is contained in:
Kai Lüke 2020-03-09 16:58:05 +01:00
parent 1bf2bba4bf
commit f9c8feb09c
No known key found for this signature in database
GPG Key ID: E5601DA3A1D902A8

View File

@ -17,7 +17,7 @@
<Info>A virtual machine</Info> <Info>A virtual machine</Info>
<Name>@@NAME@@</Name> <Name>@@NAME@@</Name>
<ProductSection ovf:required="false"> <ProductSection ovf:required="false">
<Info>CoreOS Virtual Appliance</Info> <Info>Flatcar Container Linux Virtual Appliance</Info>
<Property ovf:userConfigurable="true" ovf:type="string" <Property ovf:userConfigurable="true" ovf:type="string"
ovf:key="guestinfo.hostname" ovf:value=""> ovf:key="guestinfo.hostname" ovf:value="">
<Label>Hostname</Label> <Label>Hostname</Label>
@ -25,19 +25,34 @@
</Property> </Property>
<Property ovf:userConfigurable="true" ovf:type="string" <Property ovf:userConfigurable="true" ovf:type="string"
ovf:key="guestinfo.coreos.config.data" ovf:value=""> 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> <Description>Inline cloud-config data</Description>
</Property> </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" <Property ovf:userConfigurable="true" ovf:type="string"
ovf:key="guestinfo.coreos.config.url" ovf:value=""> 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> <Description>URL to cloud-config data</Description>
</Property> </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" <Property ovf:userConfigurable="true" ovf:type="string"
ovf:key="guestinfo.coreos.config.data.encoding" ovf:value=""> 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> <Description>Encoding for cloud-config data</Description>
</Property> </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" <Property ovf:userConfigurable="true" ovf:type="string"
ovf:key="guestinfo.interface.0.name" ovf:value=""> ovf:key="guestinfo.interface.0.name" ovf:value="">
<Label>Name for network interface 0</Label> <Label>Name for network interface 0</Label>