updte

terraform-modules · Oct 21, 2022 · 48efdb8 · 48efdb8
1 parent b955e4e
commit 48efdb8
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 18 deletions.
diff --git a/examples/vpc-transit-gateway-attachment/vpc-transit-gateway.tf b/examples/vpc-transit-gateway-attachment/vpc-transit-gateway.tf
@@ -14,6 +14,7 @@ module "vpc_tgw_data" {
 
   network_account_profile     = var.network_account_profile
   vpc_id                      = local.vpc_id
+  vpc_cidr_block              = var.vpc_cidr_block
   vpc_full_name               = var.vpc_full_name
   private_subnets_ids         = [for sn in module.subnets.private_subnets_ids : sn if lookup(sn.tags, "boc:vpc:route-table", null) == "attachment"]
   private_route_table_ids     = module.routing.private_route_table_ids
@@ -39,6 +40,7 @@ module "vpc_tgw_self" {
 
   network_account_profile     = var.network_account_profile
   vpc_id                      = local.vpc_id
+  vpc_cidr_block              = var.vpc_cidr_block
   vpc_full_name               = var.vpc_full_name
   private_subnets_ids         = [for sn in module.subnets.private_subnets_ids : sn if lookup(sn.tags, "boc:vpc:route-table", null) == "attachment"]
   private_route_table_ids     = module.routing.private_route_table_ids
@@ -61,6 +63,7 @@ module "vpc_tgw_peer" {
 
   network_account_profile     = var.network_account_profile
   vpc_id                      = local.vpc_id
+  vpc_cidr_block              = var.vpc_cidr_block
   vpc_full_name               = var.vpc_full_name
   private_subnets_ids         = [for sn in module.subnets.private_subnets_ids : sn if lookup(sn.tags, "boc:vpc:route-table", null) == "attachment"]
   private_route_table_ids     = module.routing.private_route_table_ids
@@ -72,4 +75,3 @@ module "vpc_tgw_peer" {
 
   depends_on = [module.vpc_tgw_self]
 }
-
diff --git a/examples/vpc-transit-gateway-attachment/vpn-transit-gateway.tf b/examples/vpc-transit-gateway-attachment/vpn-transit-gateway.tf
@@ -1,6 +1,6 @@
 locals {
   #  trs_region_outputs = data.terraform_remote_state.vpc_east.outputs
-  tgw_outputs = data.terraform_remote_state.vpc_global_transit-gateway.outputs
+  # tgw_outputs = data.terraform_remote_state.vpc_global_transit-gateway.outputs
   #  info_vpc    = data.terraform_remote_state.vpc.outputs.info_vpc
 
   #   _prefixes = {
@@ -16,20 +16,24 @@ locals {
 module "vpn_transit_gateway" {
   source = "git@github.e.it.census.gov:terraform-modules/aws-vpc-setup.git//vpn-transit-gateway?ref=tf-upgrade"
 
-  vpc_id                      = local.vpc_id
-  create                      = var.tgw_enable_vpn
-  profile                     = var.profile
-  vpc_name                    = var.vpc_name
-  vpc_short_name              = var.vpc_short_name
-  transit_gateway_id          = local.tgw_outputs.transit_gateway_ids[local.region]
-  tgw_environment             = var.tgw_environment
-  tgw_vpn_settings            = var.tgw_vpn_settings
-  use_tgw_prefixes            = local.use_prefixes
-  use_single_cgw              = var.use_single_cgw
-  tgw_route_table_association = local.tgw_outputs.transit_gateway_vpn_route_table_ids[local.region][var.tgw_environment]
+  vpc_id         = local.vpc_id
+  create         = var.tgw_enable_vpn
+  profile        = var.profile
+  vpc_name       = var.vpc_name
+  vpc_short_name = var.vpc_short_name
+  #transit_gateway_id          = local.tgw_outputs.transit_gateway_ids[local.region]
+  transit_gateway_id = module.vpc_tgw_data.data_output.gateway_self
+  tgw_environment    = var.tgw_environment
+  tgw_vpn_settings   = var.tgw_vpn_settings
+  use_tgw_prefixes   = local.use_prefixes
+  use_single_cgw     = var.use_single_cgw
+  #tgw_route_table_association = local.tgw_outputs.transit_gateway_vpn_route_table_ids[local.region][var.tgw_environment]
+  tgw_route_table_association = module.vpc_tgw_data.data_output.map_vpn_route_tables_self[var.tgw_environment]
   tgw_route_table_propagation = [
-    local.tgw_outputs.transit_gateway_vpn_route_table_ids[local.region][var.tgw_environment],
-    local.tgw_outputs.transit_gateway_route_table_ids[local.region][var.tgw_environment],
+    #local.tgw_outputs.transit_gateway_vpn_route_table_ids[local.region][var.tgw_environment],
+    #local.tgw_outputs.transit_gateway_route_table_ids[local.region][var.tgw_environment],
+    module.vpc_tgw_data.data_output.map_vpn_route_tables_self[var.tgw_environment],
+    module.vpc_tgw_data.data_output.map_route_tables_self[var.tgw_environment],
   ]
   enable_cloudwatch_logging = true
 
@@ -46,9 +50,10 @@ module "vpn_transit_gateway" {
 
 # propagate self cidr to vpn tgw route table
 resource "aws_ec2_transit_gateway_route_table_propagation" "vpn_vpc_self" {
-  count                          = var.tgw_enable_vpn && var.tgw_environment != null ? 1 : 0
-  transit_gateway_attachment_id  = one(module.vpc_tgw_self[*].vpc_attachment_id)
-  transit_gateway_route_table_id = local.tgw_outputs.transit_gateway_vpn_route_table_ids[local.region][var.tgw_environment]
+  count                         = var.tgw_enable_vpn && var.tgw_environment != null ? 1 : 0
+  transit_gateway_attachment_id = one(module.vpc_tgw_self[*].vpc_attachment_id)
+  #transit_gateway_route_table_id = local.tgw_outputs.transit_gateway_vpn_route_table_ids[local.region][var.tgw_environment]
+  transit_gateway_route_table_id = module.vpc_tgw_data.data_output.map_vpn_route_tables_self[var.tgw_environment]
 }
 
 output "tgw_vpn_labels" {