Merge pull request #86 from zdc/images-build-fix-01

OVA: Fixed and extended OVA builds

2 files changed, 24 insertions, 11 deletions

diff --git a/docker/Dockerfile b/docker/Dockerfile
index ea3f3d9c..a094e099 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -85,7 +85,8 @@ RUN apt-get update && apt-get install -y \
       gosu \
       po4a \
       openssh-client \
-      jq
+      jq \
+      grub2
 
 # Syslinux is only supported on x86 and x64 systems
 RUN if dpkg-architecture -ii386 || dpkg-architecture -iamd64; then \
@@ -339,6 +340,14 @@ RUN if dpkg-architecture -iarm64; then \
       u-boot-tools \
       grub-efi-arm; \
     fi
+
+# Install open-vmdk
+RUN wget -O /tmp/open-vmdk-master.zip https://github.com/vmware/open-vmdk/archive/master.zip && \
+    unzip -d /tmp/ /tmp/open-vmdk-master.zip && \
+    cd /tmp/open-vmdk-master/ && \
+    make && \
+    make install
+
 #
 # live-build: building with local packages fails due to missing keys
 # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=941691
diff --git a/scripts/template.ovf b/scripts/template.ovf
index da81a364..46ded545 100644
--- a/scripts/template.ovf
+++ b/scripts/template.ovf
@@ -5,12 +5,12 @@
   </References>
   <ovf:NetworkSection>
     <ovf:Info>The list of logical networks</ovf:Info>
-    <ovf:Network ovf:name="LAN">
-      <ovf:Description>LAN network</ovf:Description>
-    </ovf:Network>
     <ovf:Network ovf:name="WAN">
       <ovf:Description>WAN network</ovf:Description>
     </ovf:Network>
+    <ovf:Network ovf:name="LAN">
+      <ovf:Description>LAN network</ovf:Description>
+    </ovf:Network>
   </ovf:NetworkSection>
   <DeploymentOptionSection>
     <Info>List of profiles</Info>
@@ -53,7 +53,7 @@
         <Label>Public key</Label>
         <Description>The public ssh key for the appliance &apos;vyos&apos; account.</Description>
       </Property>
-      <Category>Appliance IPv4 Network Settings</Category>
+      <Category>Appliance IPv4 Network Settings (WAN interface)</Category>
       <Property ovf:key="local-hostname" ovf:qualifiers="MinLen(0),MaxLen(65535)" ovf:type="string" ovf:userConfigurable="true" ovf:value="">
         <Label>Hostname</Label>
         <Description>The host name for this virtual machine.</Description>
@@ -91,6 +91,10 @@
         <Label>API debug logging</Label>
         <Description>Enable API debug logging</Description>
       </Property>
+      <Property ovf:key="user-data" ovf:type="string" ovf:userConfigurable="true" ovf:value="">
+        <Label>Cloud-init User-Data</Label>
+        <Description>User-Data, encoded with base64.</Description>
+      </Property>
     </ProductSection>
     <ProductSection ovf:class="vm" ovf:required="false">
       <Info>VM specific properties</Info>
@@ -191,9 +195,9 @@
       <ovf:Item>
         <rasd:AddressOnParent>7</rasd:AddressOnParent>
         <rasd:AutomaticAllocation>true</rasd:AutomaticAllocation>
-        <rasd:Connection>LAN</rasd:Connection>
-        <rasd:Description>NIC representing LAN</rasd:Description>
-        <rasd:ElementName>LAN</rasd:ElementName>
+        <rasd:Connection>WAN</rasd:Connection>
+        <rasd:Description>NIC representing WAN</rasd:Description>
+        <rasd:ElementName>WAN</rasd:ElementName>
         <rasd:InstanceID>7</rasd:InstanceID>
         <rasd:ResourceSubType>vmxnet3</rasd:ResourceSubType>
         <rasd:ResourceType>10</rasd:ResourceType>
@@ -201,9 +205,9 @@
       <ovf:Item>
         <rasd:AddressOnParent>8</rasd:AddressOnParent>
         <rasd:AutomaticAllocation>true</rasd:AutomaticAllocation>
-        <rasd:Connection>WAN</rasd:Connection>
-        <rasd:Description>NIC representing WAN</rasd:Description>
-        <rasd:ElementName>WAN</rasd:ElementName>
+        <rasd:Connection>LAN</rasd:Connection>
+        <rasd:Description>NIC representing LAN</rasd:Description>
+        <rasd:ElementName>LAN</rasd:ElementName>
         <rasd:InstanceID>8</rasd:InstanceID>
         <rasd:ResourceSubType>vmxnet3</rasd:ResourceSubType>
         <rasd:ResourceType>10</rasd:ResourceType>