20707: Updates default to Debian 11 AMI. Forces cgroups v1 for crunchstat.

Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas.dipentima@curii.com>

diff --git a/tools/compute-images/arvados-images-aws.json b/tools/compute-images/arvados-images-aws.json
index 505f60ed7851cdafd378abf89e73a2857db7a970..6c7aa9c419407ae5dab8c1f26987da716e1dec67 100644 (file)
--- a/tools/compute-images/arvados-images-aws.json
+++ b/tools/compute-images/arvados-images-aws.json
@@ -4,7 +4,7 @@
     "aws_access_key": "",
     "aws_profile": "",
     "aws_secret_key": "",
-    "aws_source_ami": "ami-031283ff8a43b021c",
+    "aws_source_ami": "ami-0a9d5908c7201e91d",
     "aws_ebs_autoscale": "",
     "aws_associate_public_ip_address": "",
     "aws_ena_support": "",

diff --git a/tools/compute-images/scripts/base.sh b/tools/compute-images/scripts/base.sh
index d186f4c52e57ce39d52484a5954edeb2d84ba530..c500dc18c6496a342a5d37caa6f48aa44475c7ed 100644 (file)
--- a/tools/compute-images/scripts/base.sh
+++ b/tools/compute-images/scripts/base.sh
@@ -149,8 +149,8 @@ wait_for_apt_locks && $SUDO DEBIAN_FRONTEND=noninteractive apt-get -qq --yes rem
 $SUDO mkdir -p /etc/arvados/docker-cleaner
 $SUDO echo -e "{\n  \"Quota\": \"10G\",\n  \"RemoveStoppedContainers\": \"always\"\n}" > /etc/arvados/docker-cleaner/docker-cleaner.json
 
-# Enable cgroup accounting
-$SUDO sed -i 's/GRUB_CMDLINE_LINUX=""/GRUB_CMDLINE_LINUX="cgroup_enable=memory swapaccount=1"/g' /etc/default/grub
+# Enable cgroup accounting (forcing cgroups v1)
+$SUDO sed -i 's/GRUB_CMDLINE_LINUX=""/GRUB_CMDLINE_LINUX="cgroup_enable=memory swapaccount=1 systemd.unified_cgroup_hierarchy=0"/g' /etc/default/grub
 $SUDO update-grub
 
 # Make sure user_allow_other is set in fuse.conf