Fix Example Configuration

oci-landing-zones · Nov 23, 2023 · ac1a576 · ac1a576
1 parent 5a8c142
commit ac1a576
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 13 deletions.
diff --git a/...ansitRouting-DRGHub-NFW/input-configs-standards-options/network_configuration.auto.tfvars b/...ansitRouting-DRGHub-NFW/input-configs-standards-options/network_configuration.auto.tfvars
@@ -234,7 +234,7 @@ network_configuration = {
               DRG-HUB-VCN-H-ATTACH-KEY = {
                 display_name = "drg-hub-vcn-h-attach"
                 // Ingress Routes table - entering DRG through DRG-A-VCN-HUB
-                // drg_route_table_key = "DRG-RT-HUB-KEY"
+                drg_route_table_key = "DRG-RT-HUB-KEY"
                 network_details = {
                   attached_resource_key = "VCN-HUB-KEY"
                   type                  = "VCN"
@@ -297,7 +297,6 @@ network_configuration = {
         network_firewalls_configuration = {
           network_firewalls = {
             HUB-NFW-KEY = {
-              availability_domain         = 2
               display_name                = "hub_nfw"
               subnet_key                  = "SUBNET-H-KEY"
               ipv4address                 = "10.0.0.10"

diff --git a/...ples/TransitRouting-DRGHub-NFW/input-configs-standards-options/network_configuration.json b/...ples/TransitRouting-DRGHub-NFW/input-configs-standards-options/network_configuration.json
@@ -41,6 +41,7 @@
                 },
                 "DRG-HUB-VCN-H-ATTACH-KEY": {
                   "display_name": "drg-hub-vcn-h-attach",
+                  "drg_route_table_key": "DRG-RT-HUB-KEY",
                   "network_details": {
                     "attached_resource_key": "VCN-HUB-KEY",
                     "route_table_key": "VCN-H-INGRESS-RT-KEY",
@@ -220,7 +221,6 @@
             },
             "network_firewalls": {
               "HUB-NFW-KEY": {
-                "availability_domain": 2,
                 "display_name": "hub_nfw",
                 "ipv4address": "10.0.0.10",
                 "network_firewall_policy_key": "HUB-NFW-POLICY-KEY",

diff --git a/...ples/TransitRouting-DRGHub-NFW/input-configs-standards-options/network_configuration.yaml b/...ples/TransitRouting-DRGHub-NFW/input-configs-standards-options/network_configuration.yaml
@@ -45,7 +45,7 @@ network_configuration:
               DRG-HUB-VCN-H-ATTACH-KEY:
                 display_name: drg-hub-vcn-h-attach
                 # Ingress Routes table - entering DRG through DRG-A-VCN-HUB
-                # drg_route_table_key: DRG-RT-HUB-KEY
+                drg_route_table_key: DRG-RT-HUB-KEY
                 network_details:
                   attached_resource_key: VCN-HUB-KEY
                   # Egress Routes table - from DRGA-VCN-HUB to HUB-VCN
@@ -89,8 +89,6 @@ network_configuration:
               # Callout 2
               # Ingress Routes table - entering DRG through DRG-A-VCN-HUB
               # This should be BGP - dynamic routing
-              # The creation of dynamic routing is not supported yet by this automation
-              # On the roadmap there are plans to add support for: DrgRouteDistribution and DrgRouteDistributionStatements
               DRG-RT-HUB-KEY:
                 display_name: drg-rt-hub
                 import_drg_route_distribution_key: "IMPORT-HUB-RTD-KEY"
@@ -183,7 +181,6 @@ network_configuration:
                       type: SIMPLE
           network_firewalls:
             HUB-NFW-KEY:
-              availability_domain: 2
               display_name: hub_nfw
               ipv4address: 10.0.0.10
               network_firewall_policy_key: HUB-NFW-POLICY-KEY

diff --git a/...ansitRouting-DRGHub-NFW/input-configs-standards-options/network_configuration_no_nfw.yaml b/...ansitRouting-DRGHub-NFW/input-configs-standards-options/network_configuration_no_nfw.yaml
@@ -45,7 +45,7 @@ network_configuration:
               DRG-HUB-VCN-H-ATTACH-KEY:
                 display_name: drg-hub-vcn-h-attach
                 # Ingress Routes table - entering DRG through DRG-A-VCN-HUB
-                # drg_route_table_key: DRG-RT-HUB-KEY
+                drg_route_table_key: DRG-RT-HUB-KEY
                 network_details:
                   attached_resource_key: VCN-HUB-KEY
                   # Egress Routes table - from DRGA-VCN-HUB to HUB-VCN
@@ -89,8 +89,6 @@ network_configuration:
               # Callout 2
               # Ingress Routes table - entering DRG through DRG-A-VCN-HUB
               # This should be BGP - dynamic routing
-              # The creation of dynamic routing is not supported yet by this automation
-              # On the roadmap there are plans to add support for: DrgRouteDistribution and DrgRouteDistributionStatements
               DRG-RT-HUB-KEY:
                 display_name: drg-rt-hub
                 import_drg_route_distribution_key: "IMPORT-HUB-RTD-KEY"

diff --git a/examples/TransitRouting-DRGHub-NFW/network_configuration.auto.tfvars b/examples/TransitRouting-DRGHub-NFW/network_configuration.auto.tfvars
@@ -234,7 +234,7 @@ network_configuration = {
               DRG-HUB-VCN-H-ATTACH-KEY = {
                 display_name = "drg-hub-vcn-h-attach"
                 // Ingress Routes table - entering DRG through DRG-A-VCN-HUB
-                // drg_route_table_key = "DRG-RT-HUB-KEY"
+                drg_route_table_key = "DRG-RT-HUB-KEY"
                 network_details = {
                   attached_resource_key = "VCN-HUB-KEY"
                   type                  = "VCN"
@@ -297,7 +297,6 @@ network_configuration = {
         network_firewalls_configuration = {
           network_firewalls = {
             HUB-NFW-KEY = {
-              availability_domain         = 2
               display_name                = "hub_nfw"
               subnet_key                  = "SUBNET-H-KEY"
               ipv4address                 = "10.0.0.10"

diff --git a/examples/TransitRouting-DRGHub-NFW/network_configuration.auto.tfvars.json b/examples/TransitRouting-DRGHub-NFW/network_configuration.auto.tfvars.json
@@ -41,6 +41,7 @@
                 },
                 "DRG-HUB-VCN-H-ATTACH-KEY": {
                   "display_name": "drg-hub-vcn-h-attach",
+                  "drg_route_table_key": "DRG-RT-HUB-KEY",
                   "network_details": {
                     "attached_resource_key": "VCN-HUB-KEY",
                     "route_table_key": "VCN-H-INGRESS-RT-KEY",
@@ -220,7 +221,6 @@
             },
             "network_firewalls": {
               "HUB-NFW-KEY": {
-                "availability_domain": 2,
                 "display_name": "hub_nfw",
                 "ipv4address": "10.0.0.10",
                 "network_firewall_policy_key": "HUB-NFW-POLICY-KEY",