Merge pull request #63 from oracle-quickstart/release-1.4.1

Release 1.4.1 Former-commit-id: 8660b53
oci-landing-zones · May 21, 2024 · 763c27b · 763c27b
2 parents 3a97000 + 86e64b5
commit 763c27b
Show file tree

Hide file tree

Showing 15 changed files with 17 additions and 35 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,6 @@
 .DS_Store
 **/*.drawio.bkp
+**/*.tfstate*
+**/*.out
+**/.terraform/*
+**/*oci-credentials.tfvars.jsongit
diff --git a/README.md b/README.md
@@ -32,7 +32,7 @@ This repository is the source of truth for the OCI Open LZ, where you can find a
 | **2** | **ENABLE** | [OCI Learn LZ](/examples/oci-learn-lz/readme.md)| Use the OCI Learn LZ exercises to understand how to **design** and **configure** OCI Landing Zones. |
 | **3** | **DESIGN** | [OCI Open LZ Blueprint](/design/readme.md)  | Use the OCI Open LZ **blueprint** to design your functional, security, network, and operations view, with all the diagrams in a reusable format. Other **landing zone models** are also [available](/design/models/readme.md). |   
 | **4** | **CONFIGURE** | [OCI Open LZ Runtime View](/examples/oci-open-lz/readme.md) | Use the  OCI Open LZ runtime  **configurations** as your IaC templates. These configurations are easily adjustable to any other landing zone model and are run with [OCI Open LZ Terraform Orchestrator Module ](orchestrator/readme.md) on top of the [CIS  Landing Zone Enhanced Modules](https://www.ateam-oracle.com/post/cis-landing-zone-enhanced-modules). |                
-| **5** | **RUN** | [OCI Open LZ Terraform Orchestrator ](/orchestrator/readme.md) | Use the OCI Open LZ **orchestrator** to run an operation on several resource types into one consolidated execution. It supports **any OCI landing zone configuration**, including - but not limited to &ndash; the OCI Open LZ. </br>Use the **orchestrator** with your configurations or with the provided [operations examples](/examples/oci-open-lz/readme.md) using **Terraform CLI** or **Oracle Resource Manager (ORM)**.|
+| **5** | **RUN** | [OCI LZ Terraform Orchestrator](https://github.com/oracle-quickstart/terraform-oci-landing-zones-orchestrator/blob/main/README.md) | Use the OCI LZ **orchestrator** to run an operation on several resource types into one consolidated execution. It supports **any OCI landing zone configuration**, including - but not limited to &ndash; the OCI Open LZ. </br>Use the **orchestrator** with your configurations or with the provided [operations examples](/examples/oci-open-lz/readme.md) using **Terraform CLI** or **Oracle Resource Manager (ORM)**.|
 
 
 &nbsp; 

diff --git a/design/OCI_Open_LZ.drawio.REMOVED.git-id b/design/OCI_Open_LZ.drawio.REMOVED.git-id
@@ -1 +1 @@
-82dcc98627406e6b0eef91f2f473e51cd06349e8
+6268bd1c91ecbe6145b5d2a0342f1552806a927c
diff --git a/examples/oci-learn-lz/exercise2/config_json/oci_learn_lz_network.json b/examples/oci-learn-lz/exercise2/config_json/oci_learn_lz_network.json
@@ -32,7 +32,7 @@
             "cidr_blocks": [
               "10.0.0.0/24"
             ],
-            "default-security-list": {
+            "default_security_list": {
               "egress_rules": [
                 {
                   "description": "egress to 0.0.0.0/0 over ALL protocols",

diff --git a/examples/oci-learn-lz/exercise2/config_json/oci_learn_lz_network_solution.json b/examples/oci-learn-lz/exercise2/config_json/oci_learn_lz_network_solution.json
@@ -39,7 +39,7 @@
             "cidr_blocks": [
               "10.0.0.0/24"
             ],
-            "default-security-list": {
+            "default_security_list": {
               "egress_rules": [
                 {
                   "description": "egress to 0.0.0.0/0 over ALL protocols",
@@ -77,7 +77,8 @@
             "route_tables": {
               "SUBNET-HUB-RT-KEY": {
                 "display_name": "subnet-hub-rt",
-                "route_rules": {}
+                "route_rules": {
+                }
               }
             },
             "subnets": {
@@ -99,7 +100,7 @@
         }
       },
       "SPOKE-CHANNELS": {
-        "category_compartment_key": "CMP-CHANNELS-NETWORK-KEY",
+        "category_compartment_id": "CMP-CHANNELS-NETWORK-KEY",
         "category_freeform_tags": {
           "vision-sub-environment": "spokechannels"
         },
@@ -109,7 +110,7 @@
             "cidr_blocks": [
               "10.1.0.0/24"
             ],
-            "default-security-list": {
+            "default_security_list": {
               "egress_rules": [
                 {
                   "description": "egress to 0.0.0.0/0 over ALL protocols",
@@ -149,7 +150,8 @@
             "route_tables": {
               "SUBNET-CH-RT-KEY": {
                 "display_name": "subnet-channels-rt",
-                "route_rules": {}
+                "route_rules": {
+                }
               }
             },
             "subnets": {

diff --git a/examples/oci-learn-lz/exercise2/config_yaml/oci_learn_lz_network.yml b/examples/oci-learn-lz/exercise2/config_yaml/oci_learn_lz_network.yml
@@ -28,7 +28,7 @@ network_configuration:
           block_nat_traffic: false
           cidr_blocks:
           - 10.0.0.0/24
-          default-security-list:
+          default_security_list:
             egress_rules:
             - description: egress to 0.0.0.0/0 over ALL protocols
               dst: 0.0.0.0/0

diff --git a/examples/oci-learn-lz/exercise2/config_yaml/oci_learn_lz_network_solution.yml b/examples/oci-learn-lz/exercise2/config_yaml/oci_learn_lz_network_solution.yml
@@ -33,7 +33,7 @@ network_configuration:
           block_nat_traffic: false
           cidr_blocks:
           - 10.0.0.0/24
-          default-security-list:
+          default_security_list:
             egress_rules:
             - description: egress to 0.0.0.0/0 over ALL protocols
               dst: 0.0.0.0/0
@@ -84,7 +84,7 @@ network_configuration:
           block_nat_traffic: false
           cidr_blocks:
           - 10.1.0.0/24
-          default-security-list:
+          default_security_list:
             egress_rules:
             - description: egress to 0.0.0.0/0 over ALL protocols
               dst: 0.0.0.0/0

diff --git a/...anage_shared_services/final_configs_after_postops/open_lz_shared_network.auto.tfvars.json b/...anage_shared_services/final_configs_after_postops/open_lz_shared_network.auto.tfvars.json
@@ -358,7 +358,6 @@
                             }
                         },
                         "default_security_list": {
-                            "display_name": "defseclist-fra-hub-vcn",
                             "egress_rules": [],
                             "ingress_rules": [
                                 {

diff --git a/examples/oci-open-lz/op01_manage_shared_services/open_lz_shared_network.auto.tfvars.json b/examples/oci-open-lz/op01_manage_shared_services/open_lz_shared_network.auto.tfvars.json
@@ -217,7 +217,6 @@
                             }
                         },
                         "default_security_list": {
-                            "display_name": "defseclist-fra-hub-vcn",
                             "egress_rules": [],
                             "ingress_rules": [
                                 {

diff --git a/...-open-lz/op01_manage_shared_services/yaml-configurations/final/open_lz_shared_network.yml b/...-open-lz/op01_manage_shared_services/yaml-configurations/final/open_lz_shared_network.yml
@@ -289,7 +289,6 @@ network_configuration:
                   destination_type: SERVICE_CIDR_BLOCK
                   network_entity_key: SG-FRA-HUB-KEY
           default_security_list:
-            display_name: defseclist-fra-hub-vcn
             egress_rules: []
             ingress_rules:
             - stateless: false

diff --git a/...es/oci-open-lz/op01_manage_shared_services/yaml-configurations/open_lz_shared_network.yml b/...es/oci-open-lz/op01_manage_shared_services/yaml-configurations/open_lz_shared_network.yml
@@ -185,7 +185,6 @@ network_configuration:
                   destination_type: SERVICE_CIDR_BLOCK
                   network_entity_key: SG-FRA-HUB-KEY
           default_security_list:
-            display_name: defseclist-fra-hub-vcn
             egress_rules: []
             ingress_rules:
             - stateless: false

diff --git a/...z/op02_manage_oes/oe01/final_configs_after_postops/open_lz_oe_01_network.auto.tfvars.json b/...z/op02_manage_oes/oe01/final_configs_after_postops/open_lz_oe_01_network.auto.tfvars.json
@@ -135,7 +135,6 @@
                             }                            
                         },
                         "default_security_list": {
-                            "display_name": "defsl_fra_oe01_co_vcn",
                             "egress_rules": [],
                             "ingress_rules": [
                                 {
@@ -389,7 +388,6 @@
                             }
                         },
                         "default_security_list": {
-                            "display_name": "defsl_fra_oe01_dev_vcn",
                             "egress_rules": [],
                             "ingress_rules": [
                                 {
@@ -643,7 +641,6 @@
                             }
                         },
                         "default_security_list": {
-                            "display_name": "defsl-fra-oe01-np-vcn",
                             "egress_rules": [],
                             "ingress_rules": [
                                 {
@@ -915,7 +912,6 @@
                             }
                         },
                         "default_security_list": {
-                            "display_name": "defsl-fra-oe01-p-vcn",
                             "egress_rules": [],
                             "ingress_rules": [
                                 {
@@ -1163,7 +1159,6 @@
                             }
                         },
                         "default_security_list": {
-                            "display_name": "defsl-fra-oe01-sb-vcn",
                             "egress_rules": [],
                             "ingress_rules": [
                                 {

diff --git a/examples/oci-open-lz/op02_manage_oes/oe01/open_lz_oe_01_network.auto.tfvars.json b/examples/oci-open-lz/op02_manage_oes/oe01/open_lz_oe_01_network.auto.tfvars.json
@@ -135,7 +135,6 @@
                             }                            
                         },
                         "default_security_list": {
-                            "display_name": "defsl_fra_oe01_co_vcn",
                             "egress_rules": [],
                             "ingress_rules": [
                                 {
@@ -389,7 +388,6 @@
                             }
                         },
                         "default_security_list": {
-                            "display_name": "defsl_fra_oe01_dev_vcn",
                             "egress_rules": [],
                             "ingress_rules": [
                                 {
@@ -643,7 +641,6 @@
                             }
                         },
                         "default_security_list": {
-                            "display_name": "defsl-fra-oe01-np-vcn",
                             "egress_rules": [],
                             "ingress_rules": [
                                 {
@@ -915,7 +912,6 @@
                             }
                         },
                         "default_security_list": {
-                            "display_name": "defsl-fra-oe01-p-vcn",
                             "egress_rules": [],
                             "ingress_rules": [
                                 {
@@ -1163,7 +1159,6 @@
                             }
                         },
                         "default_security_list": {
-                            "display_name": "defsl-fra-oe01-sb-vcn",
                             "egress_rules": [],
                             "ingress_rules": [
                                 {

diff --git a/...ples/oci-open-lz/op02_manage_oes/oe01/yaml-configurations/final/open_lz_oe_01_network.yml b/...ples/oci-open-lz/op02_manage_oes/oe01/yaml-configurations/final/open_lz_oe_01_network.yml
@@ -104,7 +104,6 @@ network_configuration:
                   destination_type: CIDR_BLOCK
                   network_entity_id: "<HUB DRG OCID>"
           default_security_list:
-            display_name: defsl_fra_oe01_co_vcn
             egress_rules: []
             ingress_rules:
             - stateless: false
@@ -293,7 +292,6 @@ network_configuration:
                   destination_type: CIDR_BLOCK
                   network_entity_id: "<HUB DRG OCID>"
           default_security_list:
-            display_name: defsl_fra_oe01_dev_vcn
             egress_rules: []
             ingress_rules:
             - stateless: false
@@ -482,7 +480,6 @@ network_configuration:
                   destination_type: CIDR_BLOCK
                   network_entity_id: "<HUB DRG OCID>"
           default_security_list:
-            display_name: defsl-fra-oe01-np-vcn
             egress_rules: []
             ingress_rules:
             - stateless: false
@@ -685,7 +682,6 @@ network_configuration:
                   destination_type: CIDR_BLOCK
                   network_entity_id: "<HUB DRG OCID>"
           default_security_list:
-            display_name: defsl-fra-oe01-p-vcn
             egress_rules: []
             ingress_rules:
             - stateless: false
@@ -869,7 +865,6 @@ network_configuration:
                   destination_type: SERVICE_CIDR_BLOCK
                   network_entity_key: SG-FRA-OE01-SB-KEY
           default_security_list:
-            display_name: defsl-fra-oe01-sb-vcn
             egress_rules: []
             ingress_rules:
             - stateless: false

diff --git a/examples/oci-open-lz/op02_manage_oes/oe01/yaml-configurations/open_lz_oe_01_network.yml b/examples/oci-open-lz/op02_manage_oes/oe01/yaml-configurations/open_lz_oe_01_network.yml
@@ -104,7 +104,6 @@ network_configuration:
                   destination_type: CIDR_BLOCK
                   network_entity_id: "<HUB DRG OCID>"
           default_security_list:
-            display_name: defsl_fra_oe01_co_vcn
             egress_rules: []
             ingress_rules:
             - stateless: false
@@ -293,7 +292,6 @@ network_configuration:
                   destination_type: CIDR_BLOCK
                   network_entity_id: "<HUB DRG OCID>"
           default_security_list:
-            display_name: defsl_fra_oe01_dev_vcn
             egress_rules: []
             ingress_rules:
             - stateless: false
@@ -482,7 +480,6 @@ network_configuration:
                   destination_type: CIDR_BLOCK
                   network_entity_id: "<HUB DRG OCID>"
           default_security_list:
-            display_name: defsl-fra-oe01-np-vcn
             egress_rules: []
             ingress_rules:
             - stateless: false
@@ -685,7 +682,6 @@ network_configuration:
                   destination_type: CIDR_BLOCK
                   network_entity_id: "<HUB DRG OCID>"
           default_security_list:
-            display_name: defsl-fra-oe01-p-vcn
             egress_rules: []
             ingress_rules:
             - stateless: false
@@ -869,7 +865,6 @@ network_configuration:
                   destination_type: SERVICE_CIDR_BLOCK
                   network_entity_key: SG-FRA-OE01-SB-KEY
           default_security_list:
-            display_name: defsl-fra-oe01-sb-vcn
             egress_rules: []
             ingress_rules:
             - stateless: false
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		82dcc98627406e6b0eef91f2f473e51cd06349e8
		6268bd1c91ecbe6145b5d2a0342f1552806a927c