fix route tables with drg destination (#81)

* WIP - fix route tables with drg destination * fix route tables with drg destination * fixed typo and added links to drg submodule documentation
oracle-terraform-modules · Mar 18, 2022 · e7d3a9d · e7d3a9d
1 parent c20b1be
commit e7d3a9d
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 15 deletions.
diff --git a/README.adoc b/README.adoc
@@ -40,8 +40,8 @@ It creates the following resources:
 * An optional internet gateway and a route table
 * An optional NAT gateway and a route table
 * An optional service gateway
-* An optional dynamic routing gateway
-* An optional remote peering connection
+* An optional dynamic routing gateway _[Deprecated; use the [drg submodule](modules/drg/README.md) instead]_
+* An optional remote peering connection _[Deprecated; use the [drg submodule](modules/drg/README.md) instead]_
 * One or more optional Local Peering Gateways in requestor or acceptor mode, and possibilities to associate a Route Table
 
 It also controls the Default Security List, with a *Lockdown mode* that can be enabled or disabled

diff --git a/README.md b/README.md
@@ -8,8 +8,8 @@ It creates the following resources:
 * An optional internet gateway and a route table
 * An optional NAT gateway
 * An optional service gateway
-* An optional dynamic routing gateway
-* An optional remote peering connection
+* An optional dynamic routing gateway _[Deprecated; use [drg submodule](modules/drg/README.md) instead]_
+* An optional remote peering connection _[Deprecated; use [drg submodule](modules/drg/README.md) instead]_
 * One or more optional Local Peering Gateways in requestor or acceptor mode, and possibilities to associate a Route Table
 
 It also controls the Default Security List, with a *Lockdown mode* that can be enabled or disabled.

diff --git a/examples/drg/main.tf b/examples/drg/main.tf
@@ -42,8 +42,9 @@ module "vcn_spokes" {
   for_each = var.vcn_spokes
 
   # general oci parameters
-  compartment_id = var.compartment_id
-  label_prefix   = var.label_prefix
+  compartment_id  = var.compartment_id
+  label_prefix    = var.label_prefix
+  attached_drg_id = module.drg_hub.drg_id
 
   # vcn parameters
   create_internet_gateway  = each.value["create_internet_gateway"]  # boolean: true or false

diff --git a/examples/rpc/rpc_from_drg_module/main.tf b/examples/rpc/rpc_from_drg_module/main.tf
@@ -24,7 +24,7 @@ module "vcn_acceptor" {
   compartment_id = var.compartment_id
   label_prefix   = var.label_prefix
   freeform_tags  = var.freeform_tags
-  defined_tags = var.defined_tags
+  defined_tags   = var.defined_tags
 
   # vcn parameters
   create_drg               = false #! deprecated inner drg, use drg-module instead     
@@ -35,12 +35,13 @@ module "vcn_acceptor" {
   vcn_cidrs                = var.vcn_cidrs_acceptor
   vcn_dns_label            = "vcnacceptor"
   vcn_name                 = "vcn-rpc-acceptor"
+  attached_drg_id          = module.drg_acceptor.drg_id
 
   nat_gateway_route_rules = [for cidr in var.vcn_cidrs_requestor :
     {
       destination       = cidr # set requestor vcn cidr as destination cidr 
       destination_type  = "CIDR_BLOCK"
-      network_entity_id = module.drg_acceptor.drg_id
+      network_entity_id = "drg"
       description       = "Terraformed - User added Routing Rule to requestor VCN through DRG"
     }
   ]
@@ -121,7 +122,7 @@ module "vcn_requestor" {
     {
       destination       = cidr # set acceptor vcn cidr as destination cidr 
       destination_type  = "CIDR_BLOCK"
-      network_entity_id = module.drg_requestor.drg_id
+      network_entity_id = "drg"
       description       = "Terraformed - User added Routing Rule to acceptor VCN through DRG"
     }
   ]

diff --git a/outputs.tf b/outputs.tf
@@ -7,14 +7,13 @@ output "vcn_id" {
 }
 
 output "drg_id" {
-  #! deprecation notice: this output will be removed at next major release
-  description = "Deprecated: Use drg sub-module instead. id of drg if it is created"
-  value       = join(",", module.drg_from_vcn_module[*].drg_id)
+  description = "id of the attached drg"
+  value       = var.create_drg ? join(",", module.drg_from_vcn_module[*].drg_id) : var.attached_drg_id
 }
 
 output "rpc_id" {
   description = "id of rpc if it is created"
-  value       = join(",", module.drg_from_vcn_module[*].rpc_id)
+  value       = var.create_drg ? join(",", module.drg_from_vcn_module[*].rpc_id) : ""
 }
 
 output "nat_gateway_id" {

diff --git a/terraform.tfvars.example b/terraform.tfvars.example
@@ -35,6 +35,10 @@ freeform_tags = {
 defined_tags = {
   "Operations.CostCenter" = "42"
 }
+
+#ID of the DRG attached to the VCN
+attached_drg_id = ""
+
 # # custom routing rules variable declaration example
 
 # internet_gateway_route_rules = [ # this module input shows how to pass routing information to the vcn module inline, directly on the vcn module block

diff --git a/variables.tf b/variables.tf
@@ -195,3 +195,9 @@ variable "nat_gateway_route_rules" {
   type        = list(map(string))
   default     = null
 }
+
+variable "attached_drg_id" {
+  description = "the ID of DRG attached to the VCN"
+  type = string
+  default = ""
+}
diff --git a/vcn_gateways.tf b/vcn_gateways.tf
@@ -40,7 +40,7 @@ resource "oci_core_route_table" "ig" {
     content {
       destination       = route_rules.value.destination
       destination_type  = route_rules.value.destination_type
-      network_entity_id = module.drg_from_vcn_module[0].drg_id
+      network_entity_id = var.create_drg ? module.drg_from_vcn_module[0].drg_id : var.attached_drg_id
       description       = route_rules.value.description
     }
   }
@@ -159,7 +159,7 @@ resource "oci_core_route_table" "nat" {
     content {
       destination       = route_rules.value.destination
       destination_type  = route_rules.value.destination_type
-      network_entity_id = module.drg_from_vcn_module[0].drg_id
+      network_entity_id = var.create_drg ? module.drg_from_vcn_module[0].drg_id : var.attached_drg_id
       description       = route_rules.value.description
     }
   }