diff options
| author | zsdc <taras@vyos.io> | 2020-03-10 21:18:30 +0200 |
|---|---|---|
| committer | zsdc <taras@vyos.io> | 2020-03-19 16:31:34 +0200 |
| commit | 3949cdc476cd9511e2180a1210e99db6869c74fa (patch) | |
| tree | bbfacaa673a58ec0debf120675d57a1958b6a342 /scripts | |
| parent | 7193ed4798b1876174077b0ae5cca6a64c8ec770 (diff) | |
| download | vyos-build-3949cdc476cd9511e2180a1210e99db6869c74fa.tar.gz vyos-build-3949cdc476cd9511e2180a1210e99db6869c74fa.zip | |
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
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/template.ovf | 24 |
1 files changed, 14 insertions, 10 deletions
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 'vyos' 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> |