19164: add a few flags to the compute image builder script.

[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 c030ea6aff97d88b43d5e8412dc990a43c548e25..9e07b461c5a7156962479eadb07418c073ee4234 100644 (file)
--- a/tools/compute-images/arvados-images-aws.json
+++ b/tools/compute-images/arvados-images-aws.json
@@ -1,12 +1,13 @@
 {
   "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": "",
@@ -24,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": [{