[arvados] created: 2.6.0-164-ga41f9063c

[git repository hosting]

        at  a41f9063ccd720d398a1511c4219535311ba91ad (commit)


commit a41f9063ccd720d398a1511c4219535311ba91ad
Author: Lucas Di Pentima <lucas.dipentima at curii.com>
Date:   Mon May 15 10:24:00 2023 -0300

    20482: Makes installer.sh compatible with older (Ubuntu 18.04) git versions.
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas.dipentima at curii.com>

diff --git a/tools/salt-install/installer.sh b/tools/salt-install/installer.sh
index e5aff213e..5a55e337d 100755
--- a/tools/salt-install/installer.sh
+++ b/tools/salt-install/installer.sh
@@ -264,7 +264,7 @@ case "$subcmd" in
 	    exit 1
 	fi
 
-	BRANCH=$(git branch --show-current)
+	BRANCH=$(git rev-parse --abbrev-ref HEAD)
 
 	set -x
 

commit cf5a63cc7fa60e0c1297ea0bab1f491ae1f096bc
Author: Lucas Di Pentima <lucas.dipentima at curii.com>
Date:   Mon May 15 10:21:29 2023 -0300

    20482: Don't create S3 endpoint if using a preexisting VPC.
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas.dipentima at curii.com>

diff --git a/tools/salt-install/terraform/aws/vpc/main.tf b/tools/salt-install/terraform/aws/vpc/main.tf
index f0779d4fc..da98f1ac8 100644
--- a/tools/salt-install/terraform/aws/vpc/main.tf
+++ b/tools/salt-install/terraform/aws/vpc/main.tf
@@ -66,12 +66,13 @@ resource "aws_subnet" "private_subnet" {
 # VPC S3 access
 #
 resource "aws_vpc_endpoint" "s3" {
+  count = var.vpc_id == "" ? 1 : 0
   vpc_id = local.arvados_vpc_id
   service_name = "com.amazonaws.${var.region_name}.s3"
 }
 resource "aws_vpc_endpoint_route_table_association" "compute_s3_route" {
   count = var.private_subnet_id == "" ? 1 : 0
-  vpc_endpoint_id = aws_vpc_endpoint.s3.id
+  vpc_endpoint_id = aws_vpc_endpoint.s3[0].id
   route_table_id = aws_route_table.private_subnet_rt[0].id
 }
 

commit 10b1850aa6c44d676220c7586f2e7609bbd65489
Author: Lucas Di Pentima <lucas.dipentima at curii.com>
Date:   Mon May 15 10:20:52 2023 -0300

    20482: Fixes formatting.
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas.dipentima at curii.com>

diff --git a/tools/salt-install/terraform/aws/vpc/terraform.tfvars b/tools/salt-install/terraform/aws/vpc/terraform.tfvars
index d65b7272f..bbc5f8495 100644
--- a/tools/salt-install/terraform/aws/vpc/terraform.tfvars
+++ b/tools/salt-install/terraform/aws/vpc/terraform.tfvars
@@ -33,12 +33,12 @@
 #
 # Map assigning each node name an internal IP address
 # private_ip = {
-#   node1 = "1.2.3.4",
+#   node1 = "1.2.3.4"
 #   ...
 # }
 #
 # Map assigning DNS aliases for service node names
-# dns_aliases {
-#   node1 = ["alias1", "alias2", ...],
+# dns_aliases = {
+#   node1 = ["alias1", "alias2", ...]
 #   ...
 # }
\ No newline at end of file
diff --git a/tools/salt-install/terraform/aws/vpc/variables.tf b/tools/salt-install/terraform/aws/vpc/variables.tf
index faba88562..b91cc4214 100644
--- a/tools/salt-install/terraform/aws/vpc/variables.tf
+++ b/tools/salt-install/terraform/aws/vpc/variables.tf
@@ -43,10 +43,10 @@ variable "private_ip" {
   description = "Map with every node's private IP address"
   type = map(string)
   default = {
-    controller: "10.1.1.11",
-    workbench: "10.1.1.15",
-    shell: "10.1.2.17",
-    keep0: "10.1.2.13",
+    controller = "10.1.1.11"
+    workbench = "10.1.1.15"
+    shell = "10.1.2.17"
+    keep0 = "10.1.2.13"
   }
 }
 
@@ -54,8 +54,8 @@ variable "dns_aliases" {
   description = "Sets DNS name aliases for every service node"
   type = map(list(string))
   default = {
-    controller: ["ws"]
-    workbench: [
+    controller = ["ws"]
+    workbench = [
       "workbench2",
       "webshell",
       "keep",

-----------------------------------------------------------------------


hooks/post-receive
--