Merge branch '16379-installer-prometheus-grafana'. Closes #16379

[arvados.git] / tools / salt-install / terraform / aws / vpc / locals.tf

diff --git a/tools/salt-install/terraform/aws/vpc/locals.tf b/tools/salt-install/terraform/aws/vpc/locals.tf
index e8864c5226a7e8e4c72faaa9cbf57fbe56331c75..00e9d9494c34640abbdbd35cdd0b7c9e4290a791 100644 (file)
--- a/tools/salt-install/terraform/aws/vpc/locals.tf
+++ b/tools/salt-install/terraform/aws/vpc/locals.tf
@@ -8,21 +8,20 @@ locals {
     https: "443",
     ssh: "22",
   }
-  hostnames = [ "controller", "workbench", "keep0", "keep1", "keepproxy", "shell" ]
+  availability_zone = data.aws_availability_zones.available.names[0]
+  public_hosts = [ "controller", "workbench" ]
+  private_hosts = [ "keep0", "shell" ]
   arvados_dns_zone = "${var.cluster_name}.${var.domain_name}"
   public_ip = { for k, v in aws_eip.arvados_eip: k => v.public_ip }
   private_ip = {
-    "controller": "10.1.1.1",
-    "workbench": "10.1.1.5",
-    "keepproxy": "10.1.1.2",
-    "shell": "10.1.1.7",
-    "keep0": "10.1.1.3",
-    "keep1": "10.1.1.4"
+    "controller": "10.1.1.11",
+    "workbench": "10.1.1.15",
+    "shell": "10.1.2.17",
+    "keep0": "10.1.2.13",
   }
   aliases = {
     controller: ["ws"]
-    workbench: ["workbench2", "webshell"]
-    keepproxy: ["keep", "download", "*.collections"]
+    workbench: ["workbench2", "webshell", "keep", "download", "prometheus", "grafana", "*.collections"]
   }
   cname_by_host = flatten([
     for host, aliases in local.aliases : [
@@ -33,4 +32,3 @@ locals {
     ]
   ])
 }
-