20482: Re-exports VPC's CIDR.

Previously exported as 'vpc_cidr' and removed when preexisting vpc usage
was added. This config data is used on local.params and was mentioned on the
documentation page.
Now, it's exported as 'cluster_int_cidr' and its value is requested from AWS
so that we get the correct one whether the vpc was just created or a
previously existing one is being in use.

Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas.dipentima@curii.com>

diff --git a/tools/salt-install/terraform/aws/services/data.tf b/tools/salt-install/terraform/aws/services/data.tf
index 3587f252661409227351e55b9968de22bf27724d..0a5057e0e8822ab3201ce2662192ecc34ef20792 100644 (file)
--- a/tools/salt-install/terraform/aws/services/data.tf
+++ b/tools/salt-install/terraform/aws/services/data.tf
@@ -28,4 +28,8 @@ data "aws_ami" "debian-11" {
     name   = "virtualization-type"
     values = ["hvm"]
   }
+}
+
+data "aws_vpc" "arvados_vpc" {
+  id = data.terraform_remote_state.vpc.outputs.arvados_vpc_id
 }
\ No newline at end of file

diff --git a/tools/salt-install/terraform/aws/services/outputs.tf b/tools/salt-install/terraform/aws/services/outputs.tf
index 7ac42a783f525451cdab7df4f06244c637d15014..d0f9268ca2fcfacfa53e8ac0834d3702c4a74fc0 100644 (file)
--- a/tools/salt-install/terraform/aws/services/outputs.tf
+++ b/tools/salt-install/terraform/aws/services/outputs.tf
@@ -5,7 +5,9 @@
 output "vpc_id" {
   value = data.terraform_remote_state.vpc.outputs.arvados_vpc_id
 }
-
+output "cluster_int_cidr" {
+  value = data.aws_vpc.arvados_vpc.cidr_block
+}
 output "arvados_subnet_id" {
   value = data.terraform_remote_state.vpc.outputs.public_subnet_id
 }