Skip to content

Commit 26f9659

Browse files
skommalaabhijit-paranjpetelake
authored
Development (#232)
Merge development into main --------- Co-authored-by: Abhijit Paranjpe <[email protected]> Co-authored-by: telake <[email protected]>
1 parent 545d1f2 commit 26f9659

File tree

8 files changed

+31
-25
lines changed

8 files changed

+31
-25
lines changed

‎terraform/images/mp_image_ee_byol.tfvars‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
# Copyright (c) 2023, 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-
tf_script_version = "23.4.1-231018231905"
4+
tf_script_version = "23.4.3-231130202436"
55
use_marketplace_image = true
66
listing_id = "ocid1.appcataloglisting.oc1..aaaaaaaawd5ti5ldjzdppppi675onvo3mvjcwt64jjey7rib3beau2ngkl2q"
7-
listing_resource_version = "23.4.1-ol8.7-23.04.25-231018-1"
8-
instance_image_id = "ocid1.image.oc1..aaaaaaaax4pfhhb2qhinklrkrnmjrqqbvvis72b5mod4yohz6m7yviejq7rq"
7+
listing_resource_version = "23.4.3-ol8.8-23.09.26-231130-1"
8+
instance_image_id = "ocid1.image.oc1..aaaaaaaatomkczyox3g5pnw4oquxijcl7urcmp6s4ozmthj62h727ec7uevq"
99

1010
ucm_listing_id = "ocid1.appcataloglisting.oc1..aaaaaaaa653zc2e4fsem5hhwinmfgnv3xp4dmbq6c6gvf45okxf6xz3smhiq"
11-
ucm_listing_resource_version = "23.4.1-ol8.7-23.04.25-231018-1"
12-
ucm_instance_image_id = "ocid1.image.oc1..aaaaaaaaxi4ebsy4sndydzpp6epprpbuhjz7dv3ynad5h3kaklrkrvzv6czq"
11+
ucm_listing_resource_version = "23.4.3-ol8.8-23.09.26-231130-1"
12+
ucm_instance_image_id = "ocid1.image.oc1..aaaaaaaa4zuvippliu4zusl4ssnsbwrw5sn7toaj62y4p4obsn54wkmtsuuq"

‎terraform/images/mp_image_ee_ucm.tfvars‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# Copyright (c) 2023, 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-
tf_script_version = "23.4.1-231018231905"
4+
tf_script_version = "23.4.3-231130202436"
55
use_marketplace_image = true
66
listing_id = "ocid1.appcataloglisting.oc1..aaaaaaaa653zc2e4fsem5hhwinmfgnv3xp4dmbq6c6gvf45okxf6xz3smhiq"
7-
listing_resource_version = "23.4.1-ol8.7-23.04.25-231018-1"
8-
instance_image_id = "ocid1.image.oc1..aaaaaaaaxi4ebsy4sndydzpp6epprpbuhjz7dv3ynad5h3kaklrkrvzv6czq"
7+
listing_resource_version = "23.4.3-ol8.8-23.09.26-231130-1"
8+
instance_image_id = "ocid1.image.oc1..aaaaaaaa4zuvippliu4zusl4ssnsbwrw5sn7toaj62y4p4obsn54wkmtsuuq"

‎terraform/images/mp_image_se_byol.tfvars‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# Copyright (c) 2023, 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-
tf_script_version = "23.4.1-231018231905"
4+
tf_script_version = "23.4.3-231130202436"
55
use_marketplace_image = true
66
listing_id = "ocid1.appcataloglisting.oc1..aaaaaaaaalcwal6mfwjbezzqyj3waoxrvigml4n3lcn3hfday3ozetjqn25a"
7-
listing_resource_version = "23.4.1-ol8.7-23.04.25-231018-1"
8-
instance_image_id = "ocid1.image.oc1..aaaaaaaazcjnpfj43scz2d6e3fxzkbcxtr3fnqeaymn2erq46jmvzhpqdzya"
7+
listing_resource_version = "23.4.3-ol8.8-23.09.26-231130-1"
8+
instance_image_id = "ocid1.image.oc1..aaaaaaaa6mhaqaxk5t7xwagusc36hnoimhkqqlihvcho2ndlx2onj67u2juq"

‎terraform/images/mp_image_suite_byol.tfvars‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
# Copyright (c) 2023, 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-
tf_script_version = "23.4.1-231018231905"
4+
tf_script_version = "23.4.3-231130202436"
55
use_marketplace_image = true
66
listing_id = "ocid1.appcataloglisting.oc1..aaaaaaaajl5w3d76x5vdc4n7oqjpsxh4jtwivclvvp6gj4em3kufju6sftga"
7-
listing_resource_version = "23.4.1-ol8.7-23.04.25-231018-1"
8-
instance_image_id = "ocid1.image.oc1..aaaaaaaainafum2ncqjoyuwvfbl4vi6fnfutueuinn3g2mgvfzgquk6xqjkq"
7+
listing_resource_version = "23.4.3-ol8.8-23.09.26-231130-1"
8+
instance_image_id = "ocid1.image.oc1..aaaaaaaa22tkmyuks4hfntwc3gpsdq5dnnkmlesvj6nlaxmhb6mw2jvlx2oq"
99

1010
ucm_listing_id = "ocid1.appcataloglisting.oc1..aaaaaaaaq2vkow7zwkxg6ky4zxsnckdlfgtgmg7i4kkyev3y6zyo72mpkgza"
11-
ucm_listing_resource_version = "23.4.1-ol8.7-23.04.25-231018-1"
12-
ucm_instance_image_id = "ocid1.image.oc1..aaaaaaaaea6mqnsna4wnjmy7dcz32a5kolit6jvgwgvjwrrke642oeji6e7a"
11+
ucm_listing_resource_version = "23.4.3-ol8.8-23.09.26-231130-1"
12+
ucm_instance_image_id = "ocid1.image.oc1..aaaaaaaac4hb7q5h2i7qqpsbdyhzytaigli52qyk4mtrv5eo3d3zjb6rkjkq"

‎terraform/images/mp_image_suite_ucm.tfvars‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# Copyright (c) 2023, 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-
tf_script_version = "23.4.1-231018231905"
4+
tf_script_version = "23.4.3-231130202436"
55
use_marketplace_image = true
66
listing_id = "ocid1.appcataloglisting.oc1..aaaaaaaaq2vkow7zwkxg6ky4zxsnckdlfgtgmg7i4kkyev3y6zyo72mpkgza"
7-
listing_resource_version = "23.4.1-ol8.7-23.04.25-231018-1"
8-
instance_image_id = "ocid1.image.oc1..aaaaaaaaea6mqnsna4wnjmy7dcz32a5kolit6jvgwgvjwrrke642oeji6e7a"
7+
listing_resource_version = "23.4.3-ol8.8-23.09.26-231130-1"
8+
instance_image_id = "ocid1.image.oc1..aaaaaaaac4hb7q5h2i7qqpsbdyhzytaigli52qyk4mtrv5eo3d3zjb6rkjkq"

‎terraform/modules/compute/wls_compute/validators.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ locals {
77
#Dummy map to trigger an error in case we detect a validation error.
88
}
99
is_std_flex_shape = var.instance_shape.instanceShape == "VM.Standard.E3.Flex" || var.instance_shape.instanceShape == "VM.Standard.E4.Flex" || var.instance_shape.instanceShape == "VM.Standard3.Flex"
10-
invalid_ocpu_count_standard_shape = local.is_std_flex_shape ? (var.instance_shape.ocpus < 1 || var.instance_shape.ocpus > 64) : false
10+
invalid_ocpu_count_standard_shape = local.is_std_flex_shape ? (var.instance_shape.ocpus < 1 || var.instance_shape.ocpus > 64) : var.instance_shape.instanceShape == "VM.Standard.E5.Flex" ? (var.instance_shape.ocpus < 1 || var.instance_shape.ocpus > 94) : false
1111
is_optimized_flex_shape = var.instance_shape.instanceShape == "VM.Optimized3.Flex"
1212
invalid_ocpu_count_optimized_shape = local.is_optimized_flex_shape ? (var.instance_shape.ocpus < 1 || var.instance_shape.ocpus > 18) : false
1313

1414
#Flex shape validations
15-
invalid_standard_flex_shape_ocpus_msg = "WLSC-ERROR: The standard flex instance shape [ VM.Standard.E3.Flex, VM.Standard.E4.Flex, VM.Standard3.Flex ] support maximum 64 ocpus."
15+
invalid_standard_flex_shape_ocpus_msg = "WLSC-ERROR: The standard flex instance shapes [ VM.Standard.E3.Flex, VM.Standard.E4.Flex, VM.Standard3.Flex ] support maximum 64 ocpus and VM.Standard.E5.Flex supports a maximum of 94 ocpus."
1616
validate_standard_flex_shape_ocpus = local.invalid_ocpu_count_standard_shape ? local.validators_msg_map[local.invalid_standard_flex_shape_ocpus_msg] : null
1717

1818
invalid_optimized_flex_shape_ocpus_msg = "WLSC-ERROR: The VM.Optimized3.Flex instance shape supports maximum 18 ocpus."

‎terraform/schema.yaml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -394,9 +394,9 @@ variables:
394394
wls_ocpu_count:
395395
type: integer
396396
title: "OCPU Count"
397-
description: "The number of OCPU count for instances. Only required for VM.Standard.E3.Flex, VM.Standard.E4.Flex, VM.Optimized3.Flex, and VM.Standard3.Flex Shapes. The maximum number of ocpus for VM.Standard.E3.Flex and VM.Standard.E4.Flex is 64 while VM.Optimized3.Flex shape supports maximum of 18 ocpus. When scaled-out, the changes in OCPU count will apply only to the added nodes."
397+
description: "The number of OCPU count for instances. Only required for VM.Standard.E3.Flex, VM.Standard.E4.Flex, VM.Standard.E5.Flex, VM.Optimized3.Flex, and VM.Standard3.Flex Shapes. The maximum number of ocpus for VM.Standard.E3.Flex and VM.Standard.E4.Flex is 64, for VM.Standard.E5.Flex is 94, while VM.Optimized3.Flex shape supports 18. When scaled-out, the changes in OCPU count will apply only to the added nodes."
398398
minimum: 1
399-
maximum: 64
399+
maximum: 94
400400
multipleOf: 1
401401
default: 1
402402
required: true
@@ -410,6 +410,9 @@ variables:
410410
- eq:
411411
- ${instance_shape}
412412
- "VM.Standard.E4.Flex"
413+
- eq:
414+
- ${instance_shape}
415+
- "VM.Standard.E5.Flex"
413416
- eq:
414417
- ${instance_shape}
415418
- "VM.Optimized3.Flex"

‎terraform/schema_14110.yaml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -392,9 +392,9 @@ variables:
392392
wls_ocpu_count:
393393
type: integer
394394
title: "OCPU Count"
395-
description: "The number of OCPU count for instances. Only required for VM.Standard.E3.Flex, VM.Standard.E4.Flex, VM.Optimized3.Flex, and VM.Standard3.Flex Shapes. The maximum number of ocpus for VM.Standard.E3.Flex and VM.Standard.E4.Flex is 64 while VM.Optimized3.Flex shape supports maximum of 18 ocpus. When scaled-out, the changes in OCPU count will apply only to the added nodes."
395+
description: "The number of OCPU count for instances. Only required for VM.Standard.E3.Flex, VM.Standard.E4.Flex, VM.Standard.E5.Flex, VM.Optimized3.Flex, and VM.Standard3.Flex Shapes. The maximum number of ocpus for VM.Standard.E3.Flex and VM.Standard.E4.Flex is 64, for VM.Standard.E5.Flex is 94, while VM.Optimized3.Flex shape supports 18. When scaled-out, the changes in OCPU count will apply only to the added nodes."
396396
minimum: 1
397-
maximum: 64
397+
maximum: 94
398398
multipleOf: 1
399399
default: 1
400400
required: true
@@ -408,6 +408,9 @@ variables:
408408
- eq:
409409
- ${instance_shape}
410410
- "VM.Standard.E4.Flex"
411+
- eq:
412+
- ${instance_shape}
413+
- "VM.Standard.E5.Flex"
411414
- eq:
412415
- ${instance_shape}
413416
- "VM.Optimized3.Flex"

0 commit comments

Comments
 (0)