Skip to content

Commit 38c82f2

Browse files
roberto-sanchez-herreraroberto-sanchez-herrera
committed
Merge branch 'main' into topic_robesanc_jcs-13162
2 parents 75a3b10 + 07c6b24 commit 38c82f2

File tree

9 files changed

+94
-52
lines changed

9 files changed

+94
-52
lines changed

‎builds/build_mp_bundles.sh‎

Lines changed: 32 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -201,8 +201,8 @@ replace_byol_ee_12214_variables()
201201
sed -i 's/#- ${terms_and_conditions}/- ${terms_and_conditions}/' ${TMP_BUILD}/schema.yaml
202202
sed -i ':a;$!{N;ba};s/- ${image_mode}/#- ${image_mode}/2' ${TMP_BUILD}/schema.yaml
203203
sed -i ':a;$!{N;ba};s/- ${terms_and_conditions}/#- ${terms_and_conditions}/2' ${TMP_BUILD}/schema.yaml
204-
sed -i '/main_mktpl_image/ { n; s/ocid = ""/ocid = '"${instance_image_id}"'/; }' ${TMP_BUILD}/oci_images.tf
205-
sed -i '/ucm_image/ { n; s/ocid = ""/ocid = '"${ucm_instance_image_id}"'/; }' ${TMP_BUILD}/oci_images.tf
204+
sed -i '/main_mktpl_image/ { n; s/ocid = ""/ocid = '"${instance_image_id}"'/; }' ${TMP_BUILD}/oci_images.tf
205+
sed -i '/ucm_image/ { n; s/ocid = ""/ocid = '"${ucm_instance_image_id}"'/; }' ${TMP_BUILD}/oci_images.tf
206206
}
207207
replace_byol_ee_14110_variables()
208208
{
@@ -222,8 +222,8 @@ replace_byol_ee_14110_variables()
222222
sed -i 's/#- ${terms_and_conditions}/- ${terms_and_conditions}/' ${TMP_BUILD}/schema_14110.yaml
223223
sed -i ':a;$!{N;ba};s/- ${image_mode}/#- ${image_mode}/2' ${TMP_BUILD}/schema_14110.yaml
224224
sed -i ':a;$!{N;ba};s/- ${terms_and_conditions}/#- ${terms_and_conditions}/2' ${TMP_BUILD}/schema_14110.yaml
225-
sed -i '/main_mktpl_image/ { n; s/ocid = ""/ocid = '"${instance_image_id}"'/; }' ${TMP_BUILD}/oci_images.tf
226-
sed -i '/ucm_image/ { n; s/ocid = ""/ocid = '"${ucm_instance_image_id}"'/; }' ${TMP_BUILD}/oci_images.tf
225+
sed -i '/main_mktpl_image/ { n; s/ocid = ""/ocid = '"${instance_image_id}"'/; }' ${TMP_BUILD}/oci_images.tf
226+
sed -i '/ucm_image/ { n; s/ocid = ""/ocid = '"${ucm_instance_image_id}"'/; }' ${TMP_BUILD}/oci_images.tf
227227
}
228228
replace_byol_se_12214_variables()
229229
{
@@ -238,7 +238,10 @@ replace_byol_se_12214_variables()
238238
sed -i 's/#- ${instance_image_id}/- ${instance_image_id}/' ${TMP_BUILD}/schema.yaml
239239
sed -i 's/#- ${use_autoscaling}/- ${use_autoscaling}/' ${TMP_BUILD}/schema.yaml
240240
sed -i ':a;$!{N;ba};s/- ${use_autoscaling}/#- ${use_autoscaling}/1' ${TMP_BUILD}/schema.yaml
241-
sed -i '/main_mktpl_image/ { n; s/ocid = ""/ocid = '"${instance_image_id}"'/; }' ${TMP_BUILD}/oci_images.tf
241+
sed -i '/main_mktpl_image/ { n; s/ocid = ""/ocid = '"${instance_image_id}"'/; }' ${TMP_BUILD}/oci_images.tf
242+
export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/inputs/mp_image_ee_byol.tfvars
243+
get_mp_values
244+
sed -i '/ucm_image/ { n; s/ocid = ""/ocid = '"${ucm_instance_image_id}"'/; }' ${TMP_BUILD}/oci_images.tf
242245
}
243246
replace_byol_se_14110_variables()
244247
{
@@ -254,7 +257,10 @@ replace_byol_se_14110_variables()
254257
sed -i 's/#- ${instance_image_id}/- ${instance_image_id}/' ${TMP_BUILD}/schema_14110.yaml
255258
sed -i 's/#- ${use_autoscaling}/- ${use_autoscaling}/' ${TMP_BUILD}/schema_14110.yaml
256259
sed -i ':a;$!{N;ba};s/- ${use_autoscaling}/#- ${use_autoscaling}/1' ${TMP_BUILD}/schema_14110.yaml
257-
sed -i '/main_mktpl_image/ { n; s/ocid = ""/ocid = '"${instance_image_id}"'/; }' ${TMP_BUILD}/oci_images.tf
260+
sed -i '/main_mktpl_image/ { n; s/ocid = ""/ocid = '"${instance_image_id}"'/; }' ${TMP_BUILD}/oci_images.tf
261+
export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/inputs/mp_image_ee_byol.tfvars
262+
get_mp_values
263+
sed -i '/ucm_image/ { n; s/ocid = ""/ocid = '"${ucm_instance_image_id}"'/; }' ${TMP_BUILD}/oci_images.tf
258264
}
259265
replace_byol_suite_12214_variables()
260266
{
@@ -274,8 +280,8 @@ replace_byol_suite_12214_variables()
274280
sed -i 's/#- ${terms_and_conditions}/- ${terms_and_conditions}/' ${TMP_BUILD}/schema.yaml
275281
sed -i ':a;$!{N;ba};s/- ${image_mode}/#- ${image_mode}/2' ${TMP_BUILD}/schema.yaml
276282
sed -i ':a;$!{N;ba};s/- ${terms_and_conditions}/#- ${terms_and_conditions}/2' ${TMP_BUILD}/schema.yaml
277-
sed -i '/main_mktpl_image/ { n; s/ocid = ""/ocid = '"${instance_image_id}"'/; }' ${TMP_BUILD}/oci_images.tf
278-
sed -i '/ucm_image/ { n; s/ocid = ""/ocid = '"${ucm_instance_image_id}"'/; }' ${TMP_BUILD}/oci_images.tf
283+
sed -i '/main_mktpl_image/ { n; s/ocid = ""/ocid = '"${instance_image_id}"'/; }' ${TMP_BUILD}/oci_images.tf
284+
sed -i '/ucm_image/ { n; s/ocid = ""/ocid = '"${ucm_instance_image_id}"'/; }' ${TMP_BUILD}/oci_images.tf
279285
}
280286
replace_byol_suite_14110_variables()
281287
{
@@ -296,8 +302,8 @@ replace_byol_suite_14110_variables()
296302
sed -i 's/#- ${terms_and_conditions}/- ${terms_and_conditions}/' ${TMP_BUILD}/schema_14110.yaml
297303
sed -i ':a;$!{N;ba};s/- ${image_mode}/#- ${image_mode}/2' ${TMP_BUILD}/schema_14110.yaml
298304
sed -i ':a;$!{N;ba};s/- ${terms_and_conditions}/#- ${terms_and_conditions}/2' ${TMP_BUILD}/schema_14110.yaml
299-
sed -i '/main_mktpl_image/ { n; s/ocid = ""/ocid = '"${instance_image_id}"'/; }' ${TMP_BUILD}/oci_images.tf
300-
sed -i '/ucm_image/ { n; s/ocid = ""/ocid = '"${ucm_instance_image_id}"'/; }' ${TMP_BUILD}/oci_images.tf
305+
sed -i '/main_mktpl_image/ { n; s/ocid = ""/ocid = '"${instance_image_id}"'/; }' ${TMP_BUILD}/oci_images.tf
306+
sed -i '/ucm_image/ { n; s/ocid = ""/ocid = '"${ucm_instance_image_id}"'/; }' ${TMP_BUILD}/oci_images.tf
301307
}
302308
replace_ucm_suite_12214_variables()
303309
{
@@ -310,7 +316,10 @@ replace_ucm_suite_12214_variables()
310316
sed -i '/variable "listing_id" {/!b;n;n;n;cdefault = '"$listing_id"'' ${TMP_BUILD}/mp_variables.tf
311317
sed -i '/variable "listing_resource_version" {/!b;n;n;n;cdefault = '"$listing_resource_version"'' ${TMP_BUILD}/mp_variables.tf
312318
sed -i 's/#- ${instance_image_id}/- ${instance_image_id}/' ${TMP_BUILD}/schema.yaml
313-
sed -i '/main_mktpl_image/ { n; s/ocid = ""/ocid = '"${instance_image_id}"'/; }' ${TMP_BUILD}/oci_images.tf
319+
sed -i '/main_mktpl_image/ { n; s/ocid = ""/ocid = '"${instance_image_id}"'/; }' ${TMP_BUILD}/oci_images.tf
320+
export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/inputs/mp_image_suite_byol.tfvars
321+
get_mp_values
322+
sed -i '/ucm_image/ { n; s/ocid = ""/ocid = '"${ucm_instance_image_id}"'/; }' ${TMP_BUILD}/oci_images.tf
314323
}
315324
replace_ucm_suite_14110_variables()
316325
{
@@ -324,7 +333,10 @@ replace_ucm_suite_14110_variables()
324333
sed -i '/variable "listing_id" {/!b;n;n;n;cdefault = '"$listing_id"'' ${TMP_BUILD}/mp_variables.tf
325334
sed -i '/variable "listing_resource_version" {/!b;n;n;n;cdefault = '"$listing_resource_version"'' ${TMP_BUILD}/mp_variables.tf
326335
sed -i 's/#- ${instance_image_id}/- ${instance_image_id}/' ${TMP_BUILD}/schema_14110.yaml
327-
sed -i '/main_mktpl_image/ { n; s/ocid = ""/ocid = '"${instance_image_id}"'/; }' ${TMP_BUILD}/oci_images.tf
336+
sed -i '/main_mktpl_image/ { n; s/ocid = ""/ocid = '"${instance_image_id}"'/; }' ${TMP_BUILD}/oci_images.tf
337+
export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/inputs/mp_image_suite_byol.tfvars
338+
get_mp_values
339+
sed -i '/ucm_image/ { n; s/ocid = ""/ocid = '"${ucm_instance_image_id}"'/; }' ${TMP_BUILD}/oci_images.tf
328340
}
329341
replace_ucm_ee_12214_variables()
330342
{
@@ -336,7 +348,10 @@ replace_ucm_ee_12214_variables()
336348
sed -i '/variable "listing_id" {/!b;n;n;n;cdefault = '"$listing_id"'' ${TMP_BUILD}/mp_variables.tf
337349
sed -i '/variable "listing_resource_version" {/!b;n;n;n;cdefault = '"$listing_resource_version"'' ${TMP_BUILD}/mp_variables.tf
338350
sed -i 's/#- ${instance_image_id}/- ${instance_image_id}/' ${TMP_BUILD}/schema.yaml
339-
sed -i '/main_mktpl_image/ { n; s/ocid = ""/ocid = '"${instance_image_id}"'/; }' ${TMP_BUILD}/oci_images.tf
351+
sed -i '/main_mktpl_image/ { n; s/ocid = ""/ocid = '"${instance_image_id}"'/; }' ${TMP_BUILD}/oci_images.tf
352+
export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/inputs/mp_image_ee_byol.tfvars
353+
get_mp_values
354+
sed -i '/ucm_image/ { n; s/ocid = ""/ocid = '"${ucm_instance_image_id}"'/; }' ${TMP_BUILD}/oci_images.tf
340355
}
341356
replace_ucm_ee_14110_variables()
342357
{
@@ -349,7 +364,10 @@ replace_ucm_ee_14110_variables()
349364
sed -i '/variable "listing_id" {/!b;n;n;n;cdefault = '"$listing_id"'' ${TMP_BUILD}/mp_variables.tf
350365
sed -i '/variable "listing_resource_version" {/!b;n;n;n;cdefault = '"$listing_resource_version"'' ${TMP_BUILD}/mp_variables.tf
351366
sed -i 's/#- ${instance_image_id}/- ${instance_image_id}/' ${TMP_BUILD}/schema_14110.yaml
352-
sed -i '/main_mktpl_image/ { n; s/ocid = ""/ocid = '"${instance_image_id}"'/; }' ${TMP_BUILD}/oci_images.tf
367+
sed -i '/main_mktpl_image/ { n; s/ocid = ""/ocid = '"${instance_image_id}"'/; }' ${TMP_BUILD}/oci_images.tf
368+
export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/inputs/mp_image_ee_byol.tfvars
369+
get_mp_values
370+
sed -i '/ucm_image/ { n; s/ocid = ""/ocid = '"${ucm_instance_image_id}"'/; }' ${TMP_BUILD}/oci_images.tf
353371
}
354372

355373
get_mp_values()

‎terraform/bastion_variables.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ variable "existing_bastion_instance_id" {
1717
variable "bastion_instance_shape" {
1818
type = string
1919
description = "Shape of bastion VM instances"
20-
default = "VM.Standard2.1"
20+
default = "VM.Standard.E4.Flex"
2121
}
2222

2323
# TODO: uncomment this when UI uses control with flex shape

‎terraform/locals.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ locals {
105105
local.lb_ip,
106106
) : ""
107107

108-
async_prov_mode = !local.assign_weblogic_public_ip && !var.is_bastion_instance_required ? "Asynchronous provisioning is enabled. Connect to each compute instance and confirm that the file /u01/data/domains/${format("%s_domain", local.service_name_prefix)}/provisioningCompletedMarker exists. Details are found in the file /u01/logs/provisioning.log." : ""
108+
async_prov_mode = !local.assign_weblogic_public_ip && !var.is_bastion_instance_required ? "Asynchronous provisioning is enabled. Connect to each compute instance and confirm that the file /u01/data/domains/${format("%s_domain", local.service_name_prefix)}/provCompletedMarker exists. Details are found in the file /u01/logs/provisioning.log." : ""
109109

110110
jdk_labels = { jdk7 = "JDK 7", jdk8 = "JDK 8", jdk11 = "JDK 11" }
111111
jdk_version = var.wls_version == "14.1.1.0" ? local.jdk_labels[var.wls_14c_jdk_version] : (var.wls_version == "11.1.1.7" ? local.jdk_labels["jdk7"] : local.jdk_labels["jdk8"])

‎terraform/main.tf‎

Lines changed: 28 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -485,6 +485,7 @@ module "observability-common" {
485485

486486
compartment_id = var.compartment_ocid
487487
service_prefix_name = local.service_name_prefix
488+
add_delay = var.use_autoscaling
488489
}
489490

490491
module "observability-autoscaling" {
@@ -537,28 +538,33 @@ module "compute" {
537538
ssh_public_key = var.ssh_public_key
538539
compute_nsg_ids = local.compute_nsg_ids
539540

540-
tenancy_id = var.tenancy_ocid
541-
tf_script_version = var.tf_script_version
542-
use_regional_subnet = local.use_regional_subnet
543-
wls_14c_jdk_version = var.wls_14c_jdk_version
544-
wls_admin_user = var.wls_admin_user
545-
wls_admin_password_id = var.wls_admin_password_id
546-
wls_admin_server_name = format("%s_adminserver", local.service_name_prefix)
547-
wls_ms_server_name = format("%s_server_", local.service_name_prefix)
548-
wls_nm_port = var.wls_nm_port
549-
wls_ms_port = var.wls_ms_port
550-
wls_ms_ssl_port = var.wls_ms_ssl_port
551-
wls_ms_extern_ssl_port = var.wls_ms_extern_ssl_port
552-
wls_ms_extern_port = var.wls_ms_extern_port
553-
wls_cluster_name = format("%s_cluster", local.service_name_prefix)
554-
wls_machine_name = format("%s_machine_", local.service_name_prefix)
555-
wls_extern_admin_port = var.wls_extern_admin_port
556-
wls_extern_ssl_admin_port = var.wls_extern_ssl_admin_port
557-
wls_admin_port = var.wls_admin_port
558-
wls_admin_ssl_port = var.wls_admin_ssl_port
559-
wls_domain_name = format("%s_domain", local.service_name_prefix)
560-
wls_server_startup_args = var.wls_server_startup_args
561-
wls_existing_vcn_id = var.wls_existing_vcn_id
541+
tenancy_id = var.tenancy_ocid
542+
tf_script_version = var.tf_script_version
543+
use_regional_subnet = local.use_regional_subnet
544+
wls_14c_jdk_version = var.wls_14c_jdk_version
545+
wls_admin_user = var.wls_admin_user
546+
wls_admin_password_id = var.wls_admin_password_id
547+
wls_admin_server_name = format("%s_adminserver", local.service_name_prefix)
548+
wls_ms_server_name = format("%s_server_", local.service_name_prefix)
549+
wls_nm_port = var.wls_nm_port
550+
wls_ms_port = var.wls_ms_port
551+
wls_ms_ssl_port = var.wls_ms_ssl_port
552+
wls_ms_extern_ssl_port = var.wls_ms_extern_ssl_port
553+
wls_ms_extern_port = var.wls_ms_extern_port
554+
wls_cluster_name = format("%s_cluster", local.service_name_prefix)
555+
wls_machine_name = format("%s_machine_", local.service_name_prefix)
556+
wls_extern_admin_port = var.wls_extern_admin_port
557+
wls_extern_ssl_admin_port = var.wls_extern_ssl_admin_port
558+
wls_admin_port = var.wls_admin_port
559+
wls_admin_ssl_port = var.wls_admin_ssl_port
560+
wls_domain_name = format("%s_domain", local.service_name_prefix)
561+
wls_server_startup_args = var.wls_server_startup_args
562+
wls_existing_vcn_id = var.wls_existing_vcn_id
563+
564+
#The following two are for adding a dependency on the peering module
565+
wls_vcn_peering_dns_resolver_id = element(flatten(concat(module.vcn-peering[*].wls_vcn_dns_resolver_id, [""])), 0)
566+
wls_vcn_peering_route_table_attachment_id = local.assign_weblogic_public_ip ? element(flatten(concat(module.vcn-peering[*].wls_vcn_public_route_table_attachment_id, [""])), 0) : element(flatten(concat(module.vcn-peering[*].wls_vcn_private_route_table_attachment_id, [""])), 0)
567+
562568
mount_vcn_id = var.mount_target_id != "" ? data.oci_core_subnet.mount_target_existing_subnet[0].vcn_id : ""
563569
wls_vcn_cidr = var.wls_vcn_cidr != "" ? var.wls_vcn_cidr : element(concat(module.network-vcn.*.vcn_cidr, tolist([""])), 0)
564570
wls_version = var.wls_version

‎terraform/modules/network/vcn-config/variables.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ variable "wls_admin_port_source_cidr" {
4949

5050
variable "assign_backend_public_ip" {
5151
type = string
52-
description = "TBD"
53-
#default = false
52+
description = "Indicates if the WebLogic Server VMs will have a public IP address"
53+
default = false
5454
}
5555

5656
// Optional params

‎terraform/modules/observability/common/logging.tf‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,15 @@
11
# Copyright (c) 2022, Oracle and/or its affiliates.
22
# Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
33

4+
5+
# time delay for OCI policies to be effective
6+
resource "time_sleep" "log_grp_policy_delay" {
7+
create_duration = var.add_delay?"30s":"0s"
8+
}
9+
410
resource "oci_logging_log_group" "wlsc_log_group" {
11+
depends_on = [time_sleep.log_grp_policy_delay]
12+
513
#Required
614
compartment_id = var.compartment_id
715
display_name = format("%s_log_group", var.service_prefix_name)

‎terraform/modules/observability/common/variables.tf‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,9 @@ variable "tags" {
2222
freeform_tags = {}
2323
}
2424
}
25+
26+
variable "add_delay" {
27+
type = bool
28+
description = "Add delay to log group creation for OCI policy to be effective"
29+
default = false
30+
}

0 commit comments

Comments
 (0)