Merge branch '12684-pysdk-auto-retry'

[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 eb0371a35b1416029a2857c0c4dec1000a407056..7f433950fe99764d25f6490a198f79ef1747cf23 100644 (file)
--- a/tools/salt-install/terraform/aws/vpc/locals.tf
+++ b/tools/salt-install/terraform/aws/vpc/locals.tf
@@ -12,6 +12,15 @@ locals {
   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[*])
+
+  arvados_vpc_id = one(aws_vpc.arvados_vpc[*]) != null ? one(aws_vpc.arvados_vpc[*]).id : var.vpc_id
+  arvados_vpc_cidr_block = one(aws_vpc.arvados_vpc[*])
+
+  arvados_sg_id = one(aws_security_group.arvados_sg[*]) != null ? one(aws_security_group.arvados_sg[*]).id : var.sg_id
+
+  private_subnet_id = one(aws_subnet.private_subnet[*]) != null ? one(aws_subnet.private_subnet[*]).id : var.private_subnet_id
+  public_subnet_id = one(aws_subnet.public_subnet[*]) != null ? one(aws_subnet.public_subnet[*]).id : var.public_subnet_id
+
   public_hosts = var.private_only ? [] : var.user_facing_hosts
   private_hosts = concat(
     var.internal_service_hosts,
@@ -20,18 +29,9 @@ 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",
-  }
-  aliases = {
-    controller: ["ws"]
-    workbench: ["workbench2", "webshell", "keep", "download", "prometheus", "grafana", "*.collections"]
-  }
+  private_ip = var.private_ip
   cname_by_host = flatten([
-    for host, aliases in local.aliases : [
+    for host, aliases in var.dns_aliases : [
       for alias in aliases : {
         record = alias
         cname = host