17417: Merge branch 'main' into 17417-add-arm64

[arvados.git] / tools / compute-images / arvados-images-aws.json

diff --git a/tools/compute-images/arvados-images-aws.json b/tools/compute-images/arvados-images-aws.json
index 6a1c45da2676d903f03155c92f1ccfd13bb09f41..23b7832fcba455b4e9ed3fe13a504eb4644fd4d1 100644 (file)
--- a/tools/compute-images/arvados-images-aws.json
+++ b/tools/compute-images/arvados-images-aws.json
@@ -1,16 +1,20 @@
 {
   "variables": {
+    "arvados_cluster": "",
+    "associate_public_ip_address": "true",
     "aws_access_key": "",
-    "aws_secret_key": "",
     "aws_profile": "",
+    "aws_secret_key": "",
+    "aws_source_ami": "ami-031283ff8a43b021c",
     "build_environment": "aws",
-    "arvados_cluster": "",
-    "aws_source_ami": "ami-04d70e069399af2e9",
+    "public_key_file": "",
+    "mksquashfs_mem": "",
+    "nvidia_gpu_support": "",
+    "reposuffix": "",
+    "resolver": "",
     "ssh_user": "admin",
-    "vpc_id": "",
     "subnet_id": "",
-    "public_key_file": "",
-    "associate_public_ip_address": "true"
+    "vpc_id": ""
   },
   "builders": [{
     "type": "amazon-ebs",
@@ -26,6 +30,12 @@
     "associate_public_ip_address": "{{user `associate_public_ip_address`}}",
     "ssh_username": "{{user `ssh_user`}}",
     "ami_name": "arvados-{{user `arvados_cluster`}}-compute-{{isotime \"20060102150405\"}}",
+    "launch_block_device_mappings": [{
+      "device_name": "/dev/xvda",
+      "volume_size": 20,
+      "volume_type": "gp2",
+      "delete_on_termination": true
+    }],
     "ami_block_device_mappings": [
       {
         "device_name": "/dev/xvdb",
@@ -74,6 +84,6 @@
     "type": "shell",
     "execute_command": "sudo -S env {{ .Vars }} /bin/bash '{{ .Path }}'",
     "script": "scripts/base.sh",
-    "environment_vars": ["RESOLVER={{user `resolver`}}","REPOSUFFIX={{user `reposuffix`}}"]
+    "environment_vars": ["RESOLVER={{user `resolver`}}","REPOSUFFIX={{user `reposuffix`}}","MKSQUASHFS_MEM={{user `mksquashfs_mem`}}","NVIDIA_GPU_SUPPORT={{user `nvidia_gpu_support`}}","CLOUD=aws"]
   }]
 }