diff options
| author | Kim Hagen <kim@sentrium.io> | 2020-05-04 19:08:45 -0500 |
|---|---|---|
| committer | Kim Hagen <kim@sentrium.io> | 2020-05-04 19:08:45 -0500 |
| commit | 7e581d3656af42d8181d5d22459de20ef78a6ae4 (patch) | |
| tree | 4b4d2d4dfcf06430eac4e3f34c4ebc551638f117 /roles/vmware-ova | |
| parent | ab0d98b7baa485959506bb75c28305d86a8f3b33 (diff) | |
| download | vyos-vm-images-7e581d3656af42d8181d5d22459de20ef78a6ae4.tar.gz vyos-vm-images-7e581d3656af42d8181d5d22459de20ef78a6ae4.zip | |
use docker for ovftool, no vmware compression and update config filesimple_ova
Diffstat (limited to 'roles/vmware-ova')
| -rw-r--r-- | roles/vmware-ova/tasks/main.yml | 5 | ||||
| -rw-r--r-- | roles/vmware-ova/templates/vyos_vmware_simple.ovf.j2 | 3 |
2 files changed, 4 insertions, 4 deletions
diff --git a/roles/vmware-ova/tasks/main.yml b/roles/vmware-ova/tasks/main.yml index 85fbb6a..052722f 100644 --- a/roles/vmware-ova/tasks/main.yml +++ b/roles/vmware-ova/tasks/main.yml @@ -24,7 +24,7 @@ - name: Generate OVF become: false template: - src: templates/vyos_vmware_image.ovf.j2 + src: templates/vyos_vmware_simple.ovf.j2 dest: "{{ vyos_vmware_ovf }}" when: simple_ova - name: Generate MF @@ -39,7 +39,8 @@ content: "{{ result.stdout }}" - name: Converting the OVF to signed OVA become: false - command: "ovftool --compress=9 --privateKey={{ vyos_vmware_private_key_path }} + command: "docker run -v {{ vyos_vmware_private_key_path }}:{{ vyos_vmware_private_key_path }} + -v /tmp:/tmp moander/ovftool ovftool --privateKey={{ vyos_vmware_private_key_path }} {{ vyos_vmware_ovf }} {{ vyos_vmware_ova }}" - name: Delete temporary files for VMware file: diff --git a/roles/vmware-ova/templates/vyos_vmware_simple.ovf.j2 b/roles/vmware-ova/templates/vyos_vmware_simple.ovf.j2 index a60b66e..7316c01 100644 --- a/roles/vmware-ova/templates/vyos_vmware_simple.ovf.j2 +++ b/roles/vmware-ova/templates/vyos_vmware_simple.ovf.j2 @@ -25,7 +25,7 @@ <Info>VyOS is a Linux-based network operating system that provides software-based network routing, firewall, and VPN functionality.</Info> <Product>VyOS</Product> <Vendor>Sentrium S.L.</Vendor> - <Version>{{version}}</Version> + <Version>{{ vyos_version }}</Version> <ProductUrl>https://www.vyos.io</ProductUrl> <VendorUrl>https://sentrium.io/</VendorUrl> <AppUrl/> @@ -117,7 +117,6 @@ </ovf:Item> <vmw:Config ovf:required="false" vmw:key="cpuHotAddEnabled" vmw:value="true"/> <vmw:Config ovf:required="false" vmw:key="memoryHotAddEnabled" vmw:value="true"/> - <vmw:ExtraConfig ovf:required="false" vmw:key="sched.mem.pin" vmw:value="TRUE"/> </VirtualHardwareSection> </VirtualSystem> </ovf:Envelope> |