Merge pull request #83 from oracle-quickstart/v2.0.0-RC5

v2.0.0-RC5

Former-commit-id: 345c570

CONTRIBUTING.md

@@ -4,7 +4,7 @@ _Copyright (c) 2020, Oracle and/or its affiliates._
 
 _Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl._
 
-Pull requests can be made under [The Oracle Contributor Agreement](https://www.oracle.com/technetwork/community/oca-486395.html) (OCA).
+Pull requests can be made under [The Oracle Contributor Agreement](https://oca.opensource.oracle.com/) (OCA).
 
 For pull requests to be accepted, the bottom of your commit message must have the following line using your name and e-mail address as it appears in the OCA Signatories list.
 
@@ -18,4 +18,4 @@ This can be automatically added to pull requests by committing with:
   git commit --signoff
 ```
 
-Only pull requests from committers that can be verified as having signed the OCA can be accepted.
+Only pull requests from committers that can be verified as having signed the OCA can be accepted.

README.md

@@ -60,12 +60,12 @@ Copyright (c) 2024 Oracle and/or its affiliates.
 
 Licensed under the Universal Permissive License (UPL), Version 1.0.
 
-See [LICENSE](LICENSE) for more details.
+See [LICENSE](/LICENSE)for more details.
 
 
 [oci-lz-orchestrator]: https://github.com/oracle-quickstart/terraform-oci-landing-zones-orchestrator
 [oci-lz-iam]: https://github.com/oracle-quickstart/terraform-oci-cis-landing-zone-iam
 [oci-lz-network]: https://github.com/oracle-quickstart/terraform-oci-cis-landing-zone-networking
 [oci-lz-security]: https://github.com/oracle-quickstart/terraform-oci-cis-landing-zone-security
 [oci-lz-observability]: https://github.com/oracle-quickstart/terraform-oci-cis-landing-zone-observability
-[oci-lz-governance]: https://github.com/oracle-quickstart/terraform-oci-cis-landing-zone-governance
+[oci-lz-governance]: https://github.com/oracle-quickstart/terraform-oci-cis-landing-zone-governance

addons/oci-hub-models/hub_a/hub-a-packet_flow.md

@@ -50,4 +50,4 @@ Copyright (c) 2024 Oracle and/or its affiliates.
 
 Licensed under the Universal Permissive License (UPL), Version 1.0.
 
-See [LICENSE](LICENSE) for more details.
+See [LICENSE](/LICENSE) for more details.

addons/oci-hub-models/hub_a/readme.md

@@ -73,7 +73,7 @@ For a comprehensive understanding of how network packets flow within **Hub A** a
 
 ### 5. Automation
 
-For automating this Hub model use the [CIS Network](https://github.com/oracle-quickstart/terraform-oci-cis-landing-zone-networking) Terraform modules. As an example configuration please refer to [oci_open_lz_one-oe_network.auto.tfvars.json](/one-oe/runtime/one-stack/oci_open_lz_one-oe_network.auto.tfvars.json).
+For automating this Hub model use the [CIS Network](https://github.com/oracle-quickstart/terraform-oci-cis-landing-zone-networking) Terraform modules. As an example configuration please refer to [oci_open_lz_one-oe_network.auto.tfvars.json](/blueprints/one-oe/runtime/one-stack/oci_open_lz_one-oe_network.auto.tfvars.json).
 
 
 
@@ -87,4 +87,4 @@ Copyright (c) 2024 Oracle and/or its affiliates.
 
 Licensed under the Universal Permissive License (UPL), Version 1.0.
 
-See [LICENSE](LICENSE) for more details.
+See [LICENSE](/LICENSE) for more details.

addons/oci-hub-models/hub_b/hub-b-packet_flow.md

@@ -50,4 +50,4 @@ Copyright (c) 2024 Oracle and/or its affiliates.
 
 Licensed under the Universal Permissive License (UPL), Version 1.0.
 
-See [LICENSE](LICENSE) for more details.
+See [LICENSE](/LICENSE) for more details.

addons/oci-hub-models/hub_b/readme.md

@@ -13,7 +13,7 @@
 
  
 
-### Overview
+### 1. Overview
 **Hub B** features a single OCI Network Firewall, a next-generation managed network firewall and an intrusion detection and prevention service. This firewall handles Inbound, Outbound, and East-West traffic control and inspection, ensuring comprehensive network security and monitoring across all traffic flows.
 
 
@@ -74,7 +74,7 @@ For a comprehensive understanding of how network packets flow within **Hub B** a
 
 ### 5. Automation
 
-For automating this Hub model use the [CIS Network](https://github.com/oracle-quickstart/terraform-oci-cis-landing-zone-networking) Terraform modules. As an example configuration please refer to [oci_open_lz_one-oe_network.auto.tfvars.json](/one-oe/runtime/one-stack/oci_open_lz_one-oe_network.auto.tfvars.json).
+For automating this Hub model use the [CIS Network](https://github.com/oracle-quickstart/terraform-oci-cis-landing-zone-networking) Terraform modules. As an example configuration please refer to [oci_open_lz_one-oe_network.auto.tfvars.json](/blueprints/one-oe/runtime/one-stack/oci_open_lz_one-oe_network.auto.tfvars.json).
 
 
   
@@ -85,4 +85,4 @@ Copyright (c) 2024 Oracle and/or its affiliates.
 
 Licensed under the Universal Permissive License (UPL), Version 1.0.
 
-See [LICENSE](LICENSE) for more details.
+See [LICENSE](/LICENSE) for more details.

addons/oci-hub-models/readme.md

@@ -51,4 +51,4 @@ Copyright (c) 2024 Oracle and/or its affiliates.
 
 Licensed under the Universal Permissive License (UPL), Version 1.0.
 
-See [LICENSE](LICENSE) for more details.
+See [LICENSE](/LICENSE) for more details.

addons/oci-learn-lz/exercise1/readme.md

@@ -93,7 +93,7 @@ In this example we use YAML configurations files, but JSON files examples are al
 
 | ACTIVITY | DESCRIPTION   | 
 |---|---| 
-| **1** | Create a new ORM Stack: [![Deploy_To_OCI](../../../commons//images/DeployToOCI.jpg)](https://cloud.oracle.com/resourcemanager/stacks/create?zipUrl=https://github.com/oracle-quickstart/terraform-oci-landing-zones-orchestrator/archive/refs/tags/v2.0.0.zip&zipUrlVariables={"input_config_files_urls":"https://raw.githubusercontent.com/oracle-quickstart/terraform-oci-open-lz/master/addons/oci-learn-lz/exercise1/config_yaml/oci_learn_lz_iam_solution.yml"}) |
+| **1** | Create a new ORM Stack: [![Deploy_To_OCI](/commons/images/DeployToOCI.svg)](https://cloud.oracle.com/resourcemanager/stacks/create?zipUrl=https://github.com/oracle-quickstart/terraform-oci-landing-zones-orchestrator/archive/refs/tags/v2.0.0.zip&zipUrlVariables={"input_config_files_urls":"https://raw.githubusercontent.com/oracle-quickstart/terraform-oci-open-lz/master/addons/oci-learn-lz/exercise1/config_yaml/oci_learn_lz_iam_solution.yml"}) |
 | **2** | Accept terms,  **wait** for the configuration to load. |
 | **3** | Set the working directory to “**rms-facade**”. | 
 | **4** | Set the stack **name** you prefer. | 
@@ -113,7 +113,7 @@ In this example we use YAML configurations files, but JSON files examples are al
 
 After finalizing this exercise you have now a coherent set of artifacts: a design, a versioned configuration, OCI instantiated resources, and an ORM stack that contains the state file.
 
-You can proceed to [Exercise 2](/examples/oci-learn-lz/exercise2/readme.md).
+You can proceed to [Exercise 2](/addons/oci-learn-lz/exercise2/readme.md).
 
   
 
@@ -124,5 +124,4 @@ Copyright (c) 2024 Oracle and/or its affiliates.
 
 Licensed under the Universal Permissive License (UPL), Version 1.0.
 
-See [LICENSE](LICENSE) for more details.
-
+See [LICENSE](/LICENSE) for more details.

addons/oci-learn-lz/exercise2/readme.md

@@ -6,7 +6,7 @@
 [2. View Initial Design and Configuration](#2-view-the-initial-configuration)</br>
 [3. Complete the Configuration](#3-complete-the-configuration)</br>
 [4. Version the Configuration](#4-version-your-configuration)</br>
-[5. Run the Configuration](#5-run-your-configuration-with-orm)</br>
+[5. Run the Configuration](#5-update-and-run-your-orm-stack)</br>
 
 &nbsp; 
 
@@ -114,5 +114,4 @@ Copyright (c) 2024 Oracle and/or its affiliates.
 
 Licensed under the Universal Permissive License (UPL), Version 1.0.
 
-See [LICENSE](LICENSE) for more details.
-
+See [LICENSE](/LICENSE)for more details.

addons/readme.md

@@ -25,4 +25,4 @@ Copyright (c) 2024 Oracle and/or its affiliates.
 
 Licensed under the Universal Permissive License (UPL), Version 1.0.
 
-See [LICENSE](LICENSE) for more details.
+See [LICENSE](/LICENSE)for more details.

blueprints/multi-oe/design/readme.md

@@ -200,7 +200,7 @@ This chapter presents what cloud-native operations look like with the OCI Open L
   
 ## **5.1 Cloud-Native Operations**
 
-Cloud-native operations on cloud resources should be very near the development practices, and therefore the target operating model, for dev or ops, should be identical, or very similar, centered on **version control repositories**. This approach upholds the principle that **the repository is the only source of truth**. In the operations world, this is known as GitOps (a concept created by [Weaveworks](https://www.weave.works/blog/gitops-operations-by-pull-request)), due to the popularity of GitHub, and it requires the desired state or operation on the system to be stored such that authorized readers can view the entire audit trail of changes. All changes to the desired state are fully traceable commits associated with committer information, commit IDs, and time stamps. This means that **the infrastructure is now a set of versioned artifacts** and can be audited using the standards of software development and delivery. Find in the table below some examples of why choose this operating model.
+Cloud-native operations on cloud resources should be very near the development practices, and therefore the target operating model, for dev or ops, should be identical, or very similar, centered on **version control repositories**. This approach upholds the principle that **the repository is the only source of truth**. In the operations world, this is known as GitOps (a concept created by [Weaveworks](https://medium.com/weaveworks/gitops-operations-by-pull-request-14e8b659b058)), due to the popularity of GitHub, and it requires the desired state or operation on the system to be stored such that authorized readers can view the entire audit trail of changes. All changes to the desired state are fully traceable commits associated with committer information, commit IDs, and time stamps. This means that **the infrastructure is now a set of versioned artifacts** and can be audited using the standards of software development and delivery. Find in the table below some examples of why choose this operating model.
 
   
 
@@ -356,6 +356,4 @@ Copyright (c) 2024 Oracle and/or its affiliates.
 
 Licensed under the Universal Permissive License (UPL), Version 1.0.
 
-See [LICENSE](LICENSE) for more details.
-
-
+See [LICENSE](/LICENSE) for more details.

blueprints/multi-oe/readme.md

@@ -33,4 +33,4 @@ Copyright (c) 2024 Oracle and/or its affiliates.
 
 Licensed under the Universal Permissive License (UPL), Version 1.0.
 
-See [LICENSE](LICENSE) for more details.
+See [LICENSE](/LICENSE) for more details.

blueprints/multi-oe/runtime/op01_manage_shared_services/hub_network_config_explained.md

@@ -3,7 +3,7 @@
 ## **Table of Contents**
 
 [1. Introduction](#1-introduction)</br>
-[2. Hub VCN](#2-Hub-vcn)</br>
+[2. Hub VCN](#2-hub-vcn)</br>
 [3. Subnets](#3-subnets)</br>
 [4. Route Tables](#4-route-tables)</br>
 [5. Security Lists](#5-security-lists) </br>
@@ -1156,4 +1156,4 @@ Copyright (c) 2024 Oracle and/or its affiliates.
 
 Licensed under the Universal Permissive License (UPL), Version 1.0.
 
-See [LICENSE](LICENSE) for more details.
+See [LICENSE](/LICENSE) for more details.

blueprints/multi-oe/runtime/op01_manage_shared_services/post_op01_01_update_dynamic_groups/readme.md

@@ -15,12 +15,12 @@
 | **OP. NAME** | Update Dynamic Group membership matching rule | 
 | **OBJECTIVE** | Update Dynamic Group for security functions matching rule after the creation of the shared security compartment. |
 | **TARGET RESOURCES** | - **Security**: Dynamic Groups. |
-| **IAM CONFIG**| [open_lz_oe_01_identity.auto.tfvars.json](open_lz_oe_01_identity.auto.tfvars.json)|
+| **IAM CONFIG**| [open_lz_oe_01_identity.auto.tfvars.json](../final_configs_after_postops/open_lz_shared_identity.auto.tfvars.json)|
 | **TERRAFORM MODULES**| [CIS Landing Zone IAM](https://github.com/oracle-quickstart/terraform-oci-cis-landing-zone-iam) |
 | **DETAILS** |  For more details refer to the [OCI Open LZ Multi-OE Design document](/blueprints/multi-oe/design/OCI_Open_LZ_Multi-OE-Blueprint.pdf).|
 | **PRE-ACTIVITIES** | [OP.01 Shared Services](../readme.md) executed. Update network config with OCID of the hub. |
 | **POST-ACTIVITIES** | N/A |
-| **RUN WITH ORM** | 1. [<img src="/commons/images/DeployToOCI.svg"  height="30" align="center">](https://cloud.oracle.com/resourcemanager/stacks/create?zipUrl=https://github.com/oracle-quickstart/terraform-oci-landing-zones-orchestrator/archive/refs/tags/v2.0.0.zip&zipUrlVariables={"input_config_files_urls":"https://raw.githubusercontent.com/oracle-quickstart/terraform-oci-open-lz/master/examples/oci-open-lz/op01_manage_shared_services/open_lz_shared_identity.auto.tfvars.json,https://raw.githubusercontent.com/oracle-quickstart/terraform-oci-open-lz/master/examples/oci-open-lz/op01_manage_shared_services/open_lz_shared_network.auto.tfvars.json"})  </br>2. Accept terms,  wait for the configuration to load. </br>3. Set the working directory to “rms-facade”. </br>4. Set the stack name you prefer.</br>5. Set the terraform version to 1.2.x. Click Next. </br>6. Accept the default configurations. Click Next. Optionally, replace with your json/yaml config files. </br>8. Un-check run apply. Click Create.|
+| **RUN WITH ORM** | 1. [<img src="../../../../../commons/images/DeployToOCI.svg"  height="30" align="center">](https://cloud.oracle.com/resourcemanager/stacks/create?zipUrl=https://github.com/oracle-quickstart/terraform-oci-landing-zones-orchestrator/archive/refs/tags/v2.0.0.zip&zipUrlVariables={"input_config_files_urls":"https://raw.githubusercontent.com/oracle-quickstart/terraform-oci-open-lz/master/examples/oci-open-lz/op01_manage_shared_services/open_lz_shared_identity.auto.tfvars.json,https://raw.githubusercontent.com/oracle-quickstart/terraform-oci-open-lz/master/examples/oci-open-lz/op01_manage_shared_services/open_lz_shared_network.auto.tfvars.json"})  </br>2. Accept terms,  wait for the configuration to load. </br>3. Set the working directory to “rms-facade”. </br>4. Set the stack name you prefer.</br>5. Set the terraform version to 1.2.x. Click Next. </br>6. Accept the default configurations. Click Next. Optionally, replace with your json/yaml config files. </br>8. Un-check run apply. Click Create.|
 | **CONFIG & RUN - TERRAFORM CLI** | Follow the steps mentioned in the [OP.01](../readme.md). |
 
 &nbsp; 
@@ -51,4 +51,4 @@ Copyright (c) 2024 Oracle and/or its affiliates.
 
 Licensed under the Universal Permissive License (UPL), Version 1.0.
 
-See [LICENSE](LICENSE) for more details.
+See [LICENSE](/LICENSE)for more details.

blueprints/multi-oe/runtime/op01_manage_shared_services/post_op01_02_update_routing_nfw_ip/readme.md

@@ -3,7 +3,7 @@
 ## **Table of Contents**
 
 [1. Summary](#1-summary)</br>
-[2. Network Configuration changes](#2-iam-configuration-changes)</br>
+[2. Network Configuration changes](#2-network-configuration-changes)</br>
 
 &nbsp; 
 
@@ -15,12 +15,12 @@
 | **OP. NAME** | Update Routing with NFW Private IP | 
 | **OBJECTIVE** | After a new OCI Network Firewall is deployed, an update in Hub routing tables is needed to force some routes to passthrough the NFW private IP OCID. |
 | **TARGET RESOURCES** | - **Networking**: Routing Tables. |
-| **NETWORK CONFIG** |[open_lz_oe_01_network.auto.tfvars.json](open_lz_oe_01_network.auto.tfvars.json) |
+| **NETWORK CONFIG** |[open_lz_oe_01_network.auto.tfvars.json](../final_configs_after_postops/open_lz_shared_network.auto.tfvars.json) |
 | **TERRAFORM MODULES**| [CIS Landing Zone Network](https://github.com/oracle-quickstart/terraform-oci-cis-landing-zone-networking)  |
 | **DETAILS** |  For more details refer to the [OCI Open LZ Multi-OE Design document](/blueprints/multi-oe/design/OCI_Open_LZ_Multi-OE-Blueprint.pdf).|
 | **PRE-ACTIVITIES** | [OP.01 Shared Services](../readme.md) executed. |
 | **POST-ACTIVITIES** | N/A |
-| **RUN WITH ORM** | 1. [<img src="/commons/images/DeployToOCI.svg"  height="30" align="center">](https://cloud.oracle.com/resourcemanager/stacks/create?zipUrl=https://github.com/oracle-quickstart/terraform-oci-landing-zones-orchestrator/archive/refs/tags/v2.0.0.zip&zipUrlVariables={"input_config_files_urls":"https://raw.githubusercontent.com/oracle-quickstart/terraform-oci-open-lz/master/examples/oci-open-lz/op01_manage_shared_services/open_lz_shared_identity.auto.tfvars.json,https://raw.githubusercontent.com/oracle-quickstart/terraform-oci-open-lz/master/examples/oci-open-lz/op01_manage_shared_services/open_lz_shared_network.auto.tfvars.json"})  </br>2. Accept terms,  wait for the configuration to load. </br>3. Set the working directory to “rms-facade”. </br>4. Set the stack name you prefer.</br>5. Set the terraform version to 1.2.x. Click Next. </br>6. Accept the default configurations. Click Next. Optionally, replace with your json/yaml config files. </br>8. Un-check run apply. Click Create.|
+| **RUN WITH ORM** | 1. [<img src="../../../../../commons/images/DeployToOCI.svg"  height="30" align="center">](https://cloud.oracle.com/resourcemanager/stacks/create?zipUrl=https://github.com/oracle-quickstart/terraform-oci-landing-zones-orchestrator/archive/refs/tags/v2.0.0.zip&zipUrlVariables={"input_config_files_urls":"https://raw.githubusercontent.com/oracle-quickstart/terraform-oci-open-lz/master/examples/oci-open-lz/op01_manage_shared_services/open_lz_shared_identity.auto.tfvars.json,https://raw.githubusercontent.com/oracle-quickstart/terraform-oci-open-lz/master/examples/oci-open-lz/op01_manage_shared_services/open_lz_shared_network.auto.tfvars.json"})  </br>2. Accept terms,  wait for the configuration to load. </br>3. Set the working directory to “rms-facade”. </br>4. Set the stack name you prefer.</br>5. Set the terraform version to 1.2.x. Click Next. </br>6. Accept the default configurations. Click Next. Optionally, replace with your json/yaml config files. </br>8. Un-check run apply. Click Create.|
 | **CONFIG & RUN - TERRAFORM CLI** | Follow the steps mentioned in the [OP.01](../readme.md). |
 
 &nbsp; 
@@ -89,4 +89,4 @@ Copyright (c) 2024 Oracle and/or its affiliates.
 
 Licensed under the Universal Permissive License (UPL), Version 1.0.
 
-See [LICENSE](LICENSE) for more details.
+See [LICENSE](/LICENSE)for more details.