20482: Allow the site admin to create a non-public Arvados cluster.

[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 8338aec7ca2adcf77d52290f7a0788d061fe29b5..a6e56c5859f8945543de144ade36431cd3ac565e 100644 (file)
--- a/tools/salt-install/terraform/aws/vpc/locals.tf
+++ b/tools/salt-install/terraform/aws/vpc/locals.tf
@@ -9,21 +9,27 @@ locals {
     ssh: "22",
   }
   availability_zone = data.aws_availability_zones.available.names[0]
-  hostnames = [ "controller", "workbench", "keep0", "keep1", "keepproxy", "shell" ]
+  route53_public_zone = one(aws_route53_zone.public_zone[*])
+  iam_user_letsencrypt = one(aws_iam_user.letsencrypt[*])
+  iam_access_key_letsencrypt = one(aws_iam_access_key.letsencrypt[*])
+  public_hosts = var.private_only ? [] : var.user_facing_hosts
+  private_hosts = concat(
+    var.internal_service_hosts,
+    var.private_only ? var.user_facing_hosts : []
+  )
   arvados_dns_zone = "${var.cluster_name}.${var.domain_name}"
-  public_ip = { for k, v in aws_eip.arvados_eip: k => v.public_ip }
+  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",
-    "keepproxy": "10.1.1.12",
-    "shell": "10.1.1.17",
-    "keep0": "10.1.1.13",
-    "keep1": "10.1.1.14"
+    "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 : [
@@ -34,4 +40,3 @@ locals {
     ]
   ])
 }
-