Skip to content

Commit 5a9eefc

Browse files
kreeuwijkvasartori
andauthored
Fix GOSS handling of ARM64 images
* Add specific variables to goss for MaaS builds * fix wrong goss provider and add files to gitignore --------- Co-authored-by: Victor Sartori <victor.sartori@gmail.com>
1 parent ecbd5b0 commit 5a9eefc

4 files changed

Lines changed: 27 additions & 3 deletions

File tree

images/capi/packer/goss/goss-vars.yaml

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -490,13 +490,36 @@ ubuntu:
490490
cloud-guest-utils:
491491
cloud-initramfs-copymods:
492492
cloud-initramfs-dyn-netconf:
493+
maas:
494+
service:
495+
networkd-dispatcher:
496+
enabled: true
497+
running: true
498+
package:
499+
linux-cloud-tools-virtual:
500+
linux-tools-virtual:
501+
open-vm-tools:
502+
cloud-guest-utils:
503+
cloud-initramfs-copymods:
504+
cloud-initramfs-dyn-netconf:
505+
maas-arm64:
506+
service:
507+
networkd-dispatcher:
508+
enabled: true
509+
running: true
510+
package:
511+
linux-tools-virtual:
512+
open-vm-tools:
513+
cloud-guest-utils:
514+
cloud-initramfs-copymods:
515+
cloud-initramfs-dyn-netconf:
493516
qemu:
494517
service:
495518
networkd-dispatcher:
496519
enabled: true
497520
running: true
498521
package:
499-
#linux-cloud-tools-virtual:
522+
linux-cloud-tools-virtual:
500523
linux-tools-virtual:
501524
open-vm-tools:
502525
cloud-guest-utils:

images/capi/packer/maas/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
packer.json
2+
packer-arm64.json
23
ks.cfg
34
preseed.cfg
45
preseed-efi.cfg

images/capi/packer/maas/packer-arm64.json.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@
156156
"ARCH": "amd64",
157157
"OS": "{{user `distro_name` | lower}}",
158158
"OS_VERSION": "{{user `distribution_version` | lower}}",
159-
"PROVIDER": "qemu",
159+
"PROVIDER": "maas-arm64",
160160
"containerd_version": "{{user `containerd_version`}}",
161161
"kubernetes_cni_deb_version": "{{ user `kubernetes_cni_deb_version` }}",
162162
"kubernetes_cni_rpm_version": "{{ split (user `kubernetes_cni_rpm_version`) \"-\" 0 }}",

images/capi/packer/maas/packer.json.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@
138138
"ARCH": "amd64",
139139
"OS": "{{user `distro_name` | lower}}",
140140
"OS_VERSION": "{{user `distribution_version` | lower}}",
141-
"PROVIDER": "qemu",
141+
"PROVIDER": "maas",
142142
"containerd_version": "{{user `containerd_version`}}",
143143
"kubernetes_cni_deb_version": "{{ user `kubernetes_cni_deb_version` }}",
144144
"kubernetes_cni_rpm_version": "{{ split (user `kubernetes_cni_rpm_version`) \"-\" 0 }}",

0 commit comments

Comments
 (0)