From 99524c2ef7404a20f3933293cb8050bae3e4d4dd Mon Sep 17 00:00:00 2001
From: =?utf8?q?Javier=20B=C3=A9rtoli?= <jbertoli@curii.com>
Date: Wed, 3 Mar 2021 08:59:22 -0300
Subject: [PATCH] fix(compute-images): add resolver variable to json files
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

refs #17438

Arvados-DCO-1.1-Signed-off-by: Javier Bértoli <jbertoli@curii.com>
---
 tools/compute-images/arvados-images-aws.json  | 14 +++++++-----
 .../compute-images/arvados-images-azure.json  | 22 +++++++++----------
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/tools/compute-images/arvados-images-aws.json b/tools/compute-images/arvados-images-aws.json
index 6a1c45da26..4d757abfd2 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_secret_key": "",
     "aws_profile": "",
-    "build_environment": "aws",
-    "arvados_cluster": "",
+    "aws_secret_key": "",
     "aws_source_ami": "ami-04d70e069399af2e9",
+    "build_environment": "aws",
+    "public_key_file": "",
+    "reposuffix": "",
+    "resolver": "",
     "ssh_user": "admin",
-    "vpc_id": "",
     "subnet_id": "",
-    "public_key_file": "",
-    "associate_public_ip_address": "true"
+    "vpc_id": ""
   },
   "builders": [{
     "type": "amazon-ebs",
diff --git a/tools/compute-images/arvados-images-azure.json b/tools/compute-images/arvados-images-azure.json
index a0278d515a..ec1d9b6a63 100644
--- a/tools/compute-images/arvados-images-azure.json
+++ b/tools/compute-images/arvados-images-azure.json
@@ -1,22 +1,22 @@
 {
   "variables": {
-    "resource_group": null,
+    "account_file": "",
+    "arvados_cluster": "",
+    "build_environment": "azure-arm",
     "client_id": "{{env `ARM_CLIENT_ID`}}",
     "client_secret": "{{env `ARM_CLIENT_SECRET`}}",
-    "subscription_id": "{{env `ARM_SUBSCRIPTION_ID`}}",
-    "tenant_id": "{{env `ARM_TENANT_ID`}}",
-    "build_environment": "azure-arm",
     "cloud_environment_name": "Public",
-    "location": "centralus",
-    "ssh_user": "packer",
-    "ssh_private_key_file": "{{env `PACKERPRIVKEY`}}",
     "image_sku": "",
-    "arvados_cluster": "",
+    "location": "centralus",
     "project_id": "",
-    "account_file": "",
-    "resolver": "",
+    "public_key_file": "",
     "reposuffix": "",
-    "public_key_file": ""
+    "resolver": "",
+    "resource_group": null,
+    "ssh_private_key_file": "{{env `PACKERPRIVKEY`}}",
+    "ssh_user": "packer",
+    "subscription_id": "{{env `ARM_SUBSCRIPTION_ID`}}",
+    "tenant_id": "{{env `ARM_TENANT_ID`}}"
   },
   "builders": [
     {
-- 
2.30.2