[arvados] updated: 2.6.0-147-g34fc414b1

[git repository hosting]

Summary of changes:
 tools/salt-install/terraform/aws/vpc/locals.tf        |  7 +------
 tools/salt-install/terraform/aws/vpc/terraform.tfvars | 11 ++++++++++-
 tools/salt-install/terraform/aws/vpc/variables.tf     | 11 +++++++++++
 3 files changed, 22 insertions(+), 7 deletions(-)

       via  34fc414b10c18a1f836daad5520e335647d692eb (commit)
      from  aa22d3f08b5eae6c81a730a94825eea4ad1a191a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 34fc414b10c18a1f836daad5520e335647d692eb
Author: Lucas Di Pentima <lucas.dipentima at curii.com>
Date:   Wed May 10 16:51:55 2023 -0300

    20482: Extracts the private IP addr map as configurable variables.
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas.dipentima at curii.com>

diff --git a/tools/salt-install/terraform/aws/vpc/locals.tf b/tools/salt-install/terraform/aws/vpc/locals.tf
index 017e5d4b8..83929c14f 100644
--- a/tools/salt-install/terraform/aws/vpc/locals.tf
+++ b/tools/salt-install/terraform/aws/vpc/locals.tf
@@ -29,12 +29,7 @@ locals {
   public_ip = {
     for k, v in aws_eip.arvados_eip: k => v.public_ip
   }
-  private_ip = {
-    "controller": "10.1.1.11",
-    "workbench": "10.1.1.15",
-    "shell": "10.1.2.17",
-    "keep0": "10.1.2.13",
-  }
+  private_ip = var.private_ip
   aliases = {
     controller: ["ws"]
     workbench: ["workbench2", "webshell", "keep", "download", "prometheus", "grafana", "*.collections"]
diff --git a/tools/salt-install/terraform/aws/vpc/terraform.tfvars b/tools/salt-install/terraform/aws/vpc/terraform.tfvars
index 573825696..61e1a37bb 100644
--- a/tools/salt-install/terraform/aws/vpc/terraform.tfvars
+++ b/tools/salt-install/terraform/aws/vpc/terraform.tfvars
@@ -22,4 +22,13 @@ region_name = "us-east-1"
 #   environment = "production"
 #   project = "Phoenix"
 #   owner = "jdoe"
-# }
\ No newline at end of file
+# }
+
+# Optional cluster service nodes configuration:
+#
+# List of node names which either will be hosting user-facing or internal services
+# user_facing_hosts = [...]
+# internal_service_hosts = [...]
+#
+# Map assigning each node name an internal IP address
+# private_ip = {...}
\ 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 ec6f5711b..020c697ab 100644
--- a/tools/salt-install/terraform/aws/vpc/variables.tf
+++ b/tools/salt-install/terraform/aws/vpc/variables.tf
@@ -39,6 +39,17 @@ variable "internal_service_hosts" {
   default = [ "keep0", "shell" ]
 }
 
+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",
+  }
+}
+
 variable "vpc_id" {
   description = "Use existing VPC instead of creating one for the cluster"
   type = string

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


hooks/post-receive
--