projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
21204: Merge branch '21204-stable-log-sort' from arvados-workbench2.git
[arvados.git]
/
tools
/
salt-install
/
terraform
/
aws
/
vpc
/
outputs.tf
diff --git
a/tools/salt-install/terraform/aws/vpc/outputs.tf
b/tools/salt-install/terraform/aws/vpc/outputs.tf
index 09faa04a297f2e14f71a11c4c927068e17b70376..9424193b52e99d61278f218b77ab06df81f29eae 100644
(file)
--- a/
tools/salt-install/terraform/aws/vpc/outputs.tf
+++ b/
tools/salt-install/terraform/aws/vpc/outputs.tf
@@
-3,22
+3,22
@@
# SPDX-License-Identifier: CC-BY-SA-3.0
output "arvados_vpc_id" {
# SPDX-License-Identifier: CC-BY-SA-3.0
output "arvados_vpc_id" {
- value =
aws_vpc.arvados_vpc.
id
+ value =
local.arvados_vpc_
id
}
output "arvados_vpc_cidr" {
}
output "arvados_vpc_cidr" {
- value =
aws_vpc.arvados_vpc.cidr_block
+ value =
try(local.arvados_vpc_cidr_block, "")
}
output "public_subnet_id" {
}
output "public_subnet_id" {
- value =
aws_subnet.public_subnet.
id
+ value =
local.public_subnet_
id
}
output "private_subnet_id" {
}
output "private_subnet_id" {
- value =
aws_subnet.private_subnet.
id
+ value =
local.private_subnet_
id
}
output "arvados_sg_id" {
}
output "arvados_sg_id" {
- value =
aws_security_group.arvados_sg.
id
+ value =
local.arvados_sg_
id
}
output "eip_id" {
}
output "eip_id" {
@@
-41,16
+41,29
@@
output "private_hosts" {
value = local.private_hosts
}
value = local.private_hosts
}
+output "user_facing_hosts" {
+ value = var.user_facing_hosts
+}
+
+output "internal_service_hosts" {
+ value = var.internal_service_hosts
+}
+
+output "private_only" {
+ value = var.private_only
+}
+
output "route53_dns_ns" {
output "route53_dns_ns" {
- value =
aws_route53_zone.public_zone.name_servers
+ value =
try(local.route53_public_zone.name_servers, [])
}
output "letsencrypt_iam_access_key_id" {
}
output "letsencrypt_iam_access_key_id" {
- value = aws_iam_access_key.letsencrypt.id
+ value = try(local.iam_access_key_letsencrypt.id, "")
+ sensitive = true
}
output "letsencrypt_iam_secret_access_key" {
}
output "letsencrypt_iam_secret_access_key" {
- value =
aws_iam_access_key.letsencrypt.secret
+ value =
try(local.iam_access_key_letsencrypt.secret, "")
sensitive = true
}
sensitive = true
}
@@
-65,3
+78,7
@@
output "cluster_name" {
output "domain_name" {
value = var.domain_name
}
output "domain_name" {
value = var.domain_name
}
+
+output "custom_tags" {
+ value = var.custom_tags
+}