canonical-ubuntu-qa team mailing list archive

[Skia <mp+464625@xxxxxxxxxxxxxxxxxx>]

Skia has proposed merging ~hyask/autopkgtest-cloud:skia/fix_lxd_userdata into autopkgtest-cloud:master.

Requested reviews:
  Canonical's Ubuntu QA (canonical-ubuntu-qa)

For more details, see:
https://code.launchpad.net/~hyask/autopkgtest-cloud/+git/autopkgtest-cloud/+merge/464625

This fixes the network issues we've had on xenial/bionic/focal with armhf LXD containers.
This also modernizes a bit the userdata to better work on a Jammy host.
-- 
Your team Canonical's Ubuntu QA is requested to review the proposed merge of ~hyask/autopkgtest-cloud:skia/fix_lxd_userdata into autopkgtest-cloud:master.

diff --git a/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/tools/armhf-lxd.userdata b/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/tools/armhf-lxd.userdata
index 291715b..d48d2d7 100644
--- a/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/tools/armhf-lxd.userdata
+++ b/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/tools/armhf-lxd.userdata
@@ -8,7 +8,7 @@ apt_update: true
 apt_upgrade: true
 
 packages:
- - rng-tools
+ - rng-tools5
  - distro-info
  - libdpkg-perl
  - python3-netifaces
@@ -78,8 +78,8 @@ write_files:
          security.nesting: "true"
        description: Default LXD profile
        devices:
-         enp1s0:
-           name: enp1s0
+         eth0:
+           name: eth0
            nictype: bridged
            parent: lxdbr0
            type: nic
@@ -95,7 +95,7 @@ write_files:
      # wait until we are fully booted
      while true; do O=$(systemctl is-system-running || true); [ "$O" = running -o "$O" = degraded ] && break; sleep 1; done
      systemctl daemon-reload
-     systemctl start rng-tools
+     systemctl start rngd
      systemctl stop snap.lxd.daemon.unix.socket snap.lxd.daemon.service || true
      systemctl start snap.lxd.daemon.unix.socket snap.lxd.daemon.service
      lxd init --preseed < /var/tmp/setup/lxd-init
@@ -153,7 +153,7 @@ runcmd:
 
  - /etc/rc.local
 
- - sed -i '/GRUB_CMDLINE_LINUX_DEFAULT=/ { s/quiet splash//; s/"$/ compat_uts_machine=armv7l"/ }' /etc/default/grub
+ - sed -i '/GRUB_CMDLINE_LINUX=/ { s/quiet splash//; s/"$/ compat_uts_machine=armv7l systemd.unified_cgroup_hierarchy=false "/ }' /etc/default/grub
  - update-grub
 
  - apt-get install -y linux-image-generic