Merge branch 'main' into development

Author: skommala

terraform/schema.yaml

@@ -1432,6 +1432,12 @@ variables:
                 - ${create_new_vcn}
             - not:
                 - ${create_new_subnets}
+            - eq:
+                - ${load_balancer_strategy_new_subnet}
+                - "Create New Load Balancer"
+            - eq:
+                - ${load_balancer_strategy_existing_subnet}
+                - "Create New Load Balancer"
     type: oci:core:nsg:id
     title: "Network Security Group for Load Balancer"
     description: "The pre-created NSG that is assigned to the load balancer"
@@ -2047,7 +2053,7 @@ variables:
                     - ${add_existing_mount_target}
     type: oci:identity:availabilitydomain:name
     title: File System Availability Domain
-    description: The name of the availability domain in which to create the file system and mount target.
+    description: "The name of the availability domain for the file system and mount target"
     dependsOn:
       compartmentId: ${compartment_ocid}
     required: true

terraform/schema_14110.yaml

@@ -1441,6 +1441,12 @@ variables:
                 - ${create_new_vcn}
             - not:
                 - ${create_new_subnets}
+            - eq:
+                - ${load_balancer_strategy_new_subnet}
+                - "Create New Load Balancer"
+            - eq:
+                - ${load_balancer_strategy_existing_subnet}
+                - "Create New Load Balancer"
     type: oci:core:nsg:id
     title: "Network Security Group for Load Balancer"
     description: "The pre-created NSG that is assigned to the load balancer"
@@ -1594,7 +1600,7 @@ variables:
                     - ${add_existing_mount_target}
     type: oci:identity:availabilitydomain:name
     title: File System Availability Domain
-    description: The name of the availability domain in which to create the file system and mount target.
+    description: "The name of the availability domain for the file system and mount target"
     dependsOn:
       compartmentId: ${compartment_ocid}
     required: true

terraform/solutions/non_jrf/fss.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.
+
+### File System parameters to create new file system
+add_fss                  = true
+fss_availability_domain  = "HiGv:US-ASHBURN-AD-2"
+mount_target_subnet_cidr = "10.0.4.0/24"

terraform/solutions/non_jrf/lb.tfvars

@@ -0,0 +1,8 @@
+# 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.
+
+### Load Balancer parameters to create new public load balancer
+add_load_balancer = true
+lb_subnet_1_cidr  = "10.0.3.0/24"
+lb_min_bandwidth  = 10
+lb_max_bandwidth  = 400

terraform/solutions/non_jrf/mp_byol.tfvars

@@ -0,0 +1,12 @@
+# 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.
+
+tf_script_version        = "22.4.1-221015142357"
+use_marketplace_image    = true
+listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaawd5ti5ldjzdppppi675onvo3mvjcwt64jjey7rib3beau2ngkl2q"
+listing_resource_version = "22.4.1-ol7.9-22.08.29-221015-1"
+instance_image_id        = "ocid1.image.oc1..aaaaaaaaocv5frcscwqsk5sfqd5f66pwcf474ufasjmaktqsf7kau4qezyoq"
+
+ucm_listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaa653zc2e4fsem5hhwinmfgnv3xp4dmbq6c6gvf45okxf6xz3smhiq"
+ucm_listing_resource_version = "22.4.1-ol7.9-22.08.29-221015-1"
+ucm_instance_image_id        = "ocid1.image.oc1..aaaaaaaakygzs4drs6y3fa63axbgjs2abxgx5larzoklqyihmtul7ooegtnq"

terraform/solutions/non_jrf/nonjrf_instance.tfvars

@@ -0,0 +1,36 @@
+# 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 = "nonjrf1"
+
+### 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
+
+### Network vcn resource parameters required to create new vcn
+network_compartment_id = "ocid1.compartment.xxxxxxxxxxxxxx"
+wls_vcn_name           = "nonjrf1"
+wls_vcn_cidr           = "10.0.0.0/16"
+
+### 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    = "14.1.1.0"
+wls_ocpu_count               = 1
+wls_node_count               = 2
+wls_availability_domain_name = "HiGv:US-ASHBURN-AD-2"
+wls_subnet_cidr              = "10.0.2.0/24"
+
+### Bastion parameters to create new bastion instance
+is_bastion_instance_required = true
+bastion_subnet_cidr          = "10.0.1.0/24"
+bastion_instance_shape       = "VM.Standard2.1"
+
+### Logging parameter to enable logging service integration for WebLogic instances
+use_oci_logging = true

terraform/solutions/non_jrf/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.
+
+user_id          = "ocid1.user.xxxxxxxxxxxxxx"
+fingerprint      = "<fingerprint>"
+private_key_path = "~/.oci/oci_api_key_prod.pem"
+
+tenancy_ocid     = "ocid1.tenancy.xxxxxxxxxxxxxxxxxx"
+region           = "us-ashburn-1"
+compartment_ocid = "ocid1.compartment.xxxxxxxxxxxxxxxx"