Development (#142)

Merge development branch into main

Author: roberto-sanchez-herrera

.gitignore

@@ -9,6 +9,7 @@
 *.tfstate.*
 *.zip*
 *.tfvars
+!solutions/*.tfvars
 
 # Local .terraform lock files
 *.lock.*

terraform/solutions/non_jrf/mp_byol.tfvars renamed to solutions/common/mp_byol.tfvars

@@ -0,0 +1,7 @@
+# Copyright (c) 2022, Oracle and/or its affiliates.
+# Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
+
+### Existing Load Balancer parameters
+add_load_balancer = true
+existing_load_balancer_id = "ocid1.loadbalancer.xxxxxxxxxxxxxxx"
+backendset_name_for_existing_load_balancer = "<existing-lb-backendset-name>"

terraform/solutions/non_jrf/tenancy.tfvars renamed to solutions/common/tenancy.tfvars

@@ -0,0 +1,10 @@
+# Copyright (c) 2022, Oracle and/or its affiliates.
+# Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
+
+### IDCS parameters
+is_idcs_selected = true
+idcs_host = "identity.oraclecloud.com"
+idcs_port = 443
+idcs_tenant = "idcs-xxxxxxxxxxxxxxx"
+idcs_client_id = "<idcs_client_id>"
+idcs_client_secret_id = "ocid1.vaultsecret.xxxxxxxxxxxxxxx"

solutions/jrf/existing_lb.tfvars

@@ -0,0 +1,32 @@
+# Copyright (c) 2022, Oracle and/or its affiliates.
+# Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
+
+service_name = "jrf1"
+
+### Public/private keys used on the instance
+ssh_public_key = "<ssh_public_key>"
+
+### Set to true to create OCI IAM policies and dynamic groups required by the WebLogic for OCI stack
+create_policies = true
+generate_dg_tag = true
+
+### Existing Network VCN resource parameters
+network_compartment_id = "ocid1.compartment.xxxxxxxxxxxxxx"
+wls_existing_vcn_id = "ocid1.vcn.xxxxxxxxxxxxxxx"
+
+### WebLogic credentials to login to the console
+wls_admin_user = "weblogic"
+wls_admin_password_id = "ocid1.vaultsecret.xxxxxxxxxxxxxxx"
+
+### WebLogic server compute instance parameters
+instance_shape = "VM.Standard.E4.Flex"
+wls_version = "12.2.1.4"
+wls_ocpu_count = 1
+wls_node_count = 2
+wls_availability_domain_name = "HiGv:US-ASHBURN-AD-2"
+wls_subnet_id = "ocid1.subnet.xxxxxxxxxxxxxxx"
+
+### Bastion parameters to create new bastion instance
+is_bastion_instance_required = true
+bastion_subnet_id = "ocid1.subnet.xxxxxxxxxxxxxxx"
+bastion_instance_shape = "VM.Standard.E4.Flex"

solutions/jrf/idcs.tfvars

@@ -0,0 +1,13 @@
+# Copyright (c) 2022, Oracle and/or its affiliates.
+# Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
+
+### OCI DB Parameters
+oci_db_compartment_id = "ocid1.compartment.xxxxxxxxxxxxxxx"
+oci_db_dbsystem_id = "ocid1.dbsystem.xxxxxxxxxxxxxxx"
+oci_db_database_id = "ocid1.database.xxxxxxxxxxxxxxx"
+oci_db_pdb_service_name	= "<oci_db_pdb_service_name>"
+oci_db_user = "SYS"
+oci_db_password_id = "ocid1.vaultsecret.xxxxxxxxxxxxxxx"
+oci_db_network_compartment_id = "ocid1.compartment.xxxxxxxxxxxxxxx"
+oci_db_existing_vcn_id = "ocid1.vcn.xxxxxxxxxxxxxxxa"
+db_existing_vcn_add_secrule = true

solutions/jrf/jrf_instance.tfvars

@@ -234,7 +234,7 @@ resource "oci_core_network_security_group_security_rule" "fss_ingress_security_r
 resource "oci_core_network_security_group_security_rule" "egress_security_rule" {
   for_each = {
     for nsg_name, nsg_id in var.nsg_ids :
-    nsg_name => nsg_id if nsg_name != "managed_nsg_id" && nsg_name != "mount_target_nsg_id" && length(nsg_id) != 0
+    nsg_name => nsg_id if nsg_name != "admin_nsg_id" && nsg_name != "mount_target_nsg_id" && length(nsg_id) != 0
   }
   network_security_group_id = element(each.value, 0)
   direction                 = "EGRESS"

solutions/jrf/oci_db.tfvars

@@ -645,8 +645,8 @@ variables:
             - ${create_new_vcn}
     type: boolean
     default: false
-    title: "Existing Mount Target"
-    description: "Use the existing mount target ID"
+    title: "Add Existing Mount Target"
+    description: "Use the existing mount target"
 
   mount_target_compartment_id:
     visible:
@@ -2083,8 +2083,8 @@ variables:
         - not:
             - ${create_new_vcn}
     type: oci:mount:target:id
-    title: Existing Mount Target ID
-    description: The Oracle Cloud Identifier (OCID) of your existing mount target. The existing mount target must be in the same subnet which is already present in the chosen VCN.
+    title: "Existing Mount Target"
+    description: "The existing mount target to select from file system availability domain and mount target compartment"
     dependsOn:
       compartmentId: ${mount_target_compartment_id}
       availabilityDomain: ${fss_availability_domain}

terraform/solutions/non_jrf/fss.tfvars renamed to solutions/non_jrf/fss.tfvars

@@ -654,8 +654,8 @@ variables:
             - ${create_new_vcn}
     type: boolean
     default: false
-    title: "Existing Mount Target"
-    description: "Use the existing mount target ID"
+    title: "Add Existing Mount Target"
+    description: "Use the existing mount target"
 
   mount_target_compartment_id:
     visible:
@@ -1630,8 +1630,8 @@ variables:
         - not:
             - ${create_new_vcn}
     type: oci:mount:target:id
-    title: Existing Mount Target ID
-    description: The Oracle Cloud Identifier (OCID) of your existing mount target. The existing mount target must be in the same subnet which is already present in the chosen VCN.
+    title: "Existing Mount Target"
+    description: "The existing mount target to select from file system availability domain and mount target compartment"
     dependsOn:
       compartmentId: ${mount_target_compartment_id}
       availabilityDomain: ${fss_availability_domain}