From 3949cdc476cd9511e2180a1210e99db6869c74fa Mon Sep 17 00:00:00 2001
From: zsdc <taras@vyos.io>
Date: Tue, 10 Mar 2020 21:18:30 +0200
Subject: OVA: T2116: Fixed and extended OVA builds

 - added grub2 package to the Dockerfile (required to build OVA)
 - added open-vmdk to the Dockerfile (required to build OVA)
 - fixed WAN/LAN confusion in OVF template
 - added Cloud-init User-Data to the OVF template
---
 docker/Dockerfile    | 10 +++++++++-
 scripts/template.ovf | 24 ++++++++++++++----------
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 109829e2..78f2d5ef 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -69,7 +69,8 @@ RUN apt-get update && apt-get install -y \
       libssl-dev \
       libssl1.0.0 \
       openssh-client \
-      jq
+      jq \
+      grub2
 
 #
 # Setup Debian Jessie Backports repository
@@ -346,6 +347,13 @@ RUN apt-get update && apt-get install -y \
       python3-six \
       python3-yaml
 
+# 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
+
 # Update live-build
 RUN echo 'deb http://ftp.debian.org/debian stretch main' | tee -a /etc/apt/sources.list.d/stretch.list && \
     apt-get update && apt-get install -y -t stretch \
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>
-- 
cgit v1.2.3