X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/b9262c0e8c04f6b3d68f1ca301cc2ec56c2ef164..f3cb43d4be379703a965a1cb14cae5f5c855728f:/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 94cb24adf9..9e07b461c5 100644
--- a/tools/compute-images/arvados-images-aws.json
+++ b/tools/compute-images/arvados-images-aws.json
@@ -1,16 +1,18 @@
 {
   "variables": {
     "arvados_cluster": "",
-    "associate_public_ip_address": "true",
     "aws_access_key": "",
     "aws_profile": "",
     "aws_secret_key": "",
     "aws_source_ami": "ami-031283ff8a43b021c",
     "aws_ebs_autoscale": "",
+    "aws_associate_public_ip_address": "",
+    "aws_ena_support": "",
     "build_environment": "aws",
     "public_key_file": "",
     "mksquashfs_mem": "",
     "nvidia_gpu_support": "",
+    "goversion": "",
     "reposuffix": "",
     "resolver": "",
     "ssh_user": "admin",
@@ -23,12 +25,12 @@
     "access_key": "{{user `aws_access_key`}}",
     "secret_key": "{{user `aws_secret_key`}}",
     "region": "{{user `aws_default_region`}}",
-    "ena_support": "true",
+    "ena_support": "{{user `aws_ena_support`}}",
     "source_ami": "{{user `aws_source_ami`}}",
     "instance_type": "m5.large",
     "vpc_id": "{{user `vpc_id`}}",
     "subnet_id": "{{user `subnet_id`}}",
-    "associate_public_ip_address": "{{user `associate_public_ip_address`}}",
+    "associate_public_ip_address": "{{user `aws_associate_public_ip_address`}}",
     "ssh_username": "{{user `ssh_user`}}",
     "ami_name": "arvados-{{user `arvados_cluster`}}-compute-{{isotime \"20060102150405\"}}",
     "launch_block_device_mappings": [{
@@ -93,6 +95,6 @@
     "type": "shell",
     "execute_command": "sudo -S env {{ .Vars }} /bin/bash '{{ .Path }}'",
     "script": "scripts/base.sh",
-    "environment_vars": ["RESOLVER={{user `resolver`}}","REPOSUFFIX={{user `reposuffix`}}","MKSQUASHFS_MEM={{user `mksquashfs_mem`}}","NVIDIA_GPU_SUPPORT={{user `nvidia_gpu_support`}}","CLOUD=aws","AWS_EBS_AUTOSCALE={{user `aws_ebs_autoscale`}}"]
+    "environment_vars": ["RESOLVER={{user `resolver`}}","REPOSUFFIX={{user `reposuffix`}}","MKSQUASHFS_MEM={{user `mksquashfs_mem`}}","NVIDIA_GPU_SUPPORT={{user `nvidia_gpu_support`}}","CLOUD=aws","AWS_EBS_AUTOSCALE={{user `aws_ebs_autoscale`}}","GOVERSION={{user `goversion`}}"]
   }]
 }