18658: ensure custom SSL certs are copied to the correct host dir

[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 64b611e5e2a6979bc5a4cba963b56566c00e9770..23b7832fcba455b4e9ed3fe13a504eb4644fd4d1 100644 (file)
--- a/tools/compute-images/arvados-images-aws.json
+++ b/tools/compute-images/arvados-images-aws.json
@@ -5,9 +5,11 @@
     "aws_access_key": "",
     "aws_profile": "",
     "aws_secret_key": "",
-    "aws_source_ami": "ami-04d70e069399af2e9",
+    "aws_source_ami": "ami-031283ff8a43b021c",
     "build_environment": "aws",
     "public_key_file": "",
+    "mksquashfs_mem": "",
+    "nvidia_gpu_support": "",
     "reposuffix": "",
     "resolver": "",
     "ssh_user": "admin",
@@ -28,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",
@@ -60,10 +68,6 @@
     "type": "file",
     "source": "1078ECD7.asc",
     "destination": "/tmp/1078ECD7.asc"
-  },{
-    "type": "file",
-    "source": "2649A5A9.asc",
-    "destination": "/tmp/2649A5A9.asc"
   },{
     "type": "file",
     "source": "scripts/etc-cloud-cloud.cfg.d-07_compute_arvados_dispatch_cloud.cfg",
@@ -80,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"]
   }]
 }