Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Topic sk uptake development #247

Open
wants to merge 30 commits into
base: main
Choose a base branch
from
Open

Topic sk uptake development #247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
a41ddb0
Fix the jira 13945 (#216)
skommala Jul 27, 2023
46c4c45
Fix bug Certificate on LB is reset in scaling operation (#219)
skommala Aug 24, 2023
c1a5cd9
Uptake 23.3.2 values. (#220)
skommala Aug 29, 2023
c62a608
Merge branch 'main' into development
skommala Aug 30, 2023
68af3dc
Merge branch 'development' of https://github.com/oracle-quickstart/we…
skommala Sep 13, 2023
4b0d953
Topic sk jcs 14015 (#222)
skommala Sep 13, 2023
6eb01ae
Merge branch 'development' of https://github.com/oracle-quickstart/we…
skommala Sep 19, 2023
25666e2
JCS-14035 - Fail to get password expiry date when using connect strin…
telake Sep 26, 2023
b70ef30
JCS-13959 - validate_vcn_cidr.py always returning errors in bootstrap…
telake Sep 26, 2023
1fd4172
JCS-14038 - Missing OSMS agent required dynamic-group policies (#223)
telake Sep 26, 2023
47e4c7d
Merge branch 'development' of https://github.com/oracle-quickstart/we…
skommala Sep 28, 2023
c2aabe8
Topic sk uptake mp 23.3.3 (#226)
skommala Sep 28, 2023
784665c
Merge branch 'development' of https://github.com/oracle-quickstart/we…
skommala Sep 28, 2023
08e19db
Merge branch 'main' into development
skommala Sep 28, 2023
c6b8a8d
Merge branch 'development' of https://github.com/oracle-quickstart/we…
skommala Oct 19, 2023
f187ef5
Topic sk uptake mp 23.4.1 (#228)
skommala Oct 19, 2023
5561471
Merge branch 'main' into development
skommala Oct 19, 2023
58251b3
JCS-14046 Support VM.Standard.E5.Flex shape, but not as default shape…
telake Oct 30, 2023
e11ae24
Merge branch 'development' of https://github.com/oracle-quickstart/we…
skommala Dec 1, 2023
12b2a7d
Topic sk uptake mp 23.4.3 (#231)
skommala Dec 1, 2023
c021e55
Merge branch 'main' into development
skommala Dec 1, 2023
d3ee4b4
Merge branch 'development' of https://github.com/oracle-quickstart/we…
skommala Jan 18, 2024
687f61b
Uptake 24.1.1 mp values. (#233)
skommala Jan 18, 2024
5c51337
Merge branch 'main' into development
skommala Jan 18, 2024
24871e3
JCS-14023 Status check missing from public subnet provisioning (#238)
telake Feb 22, 2024
0007d58
Uptake 24.1.2 mp values. (#242)
skommala Mar 5, 2024
2515cf2
Merge branch 'development' into main
skommala Mar 5, 2024
2acd55c
Merge branch 'main' of https://github.com/oracle-quickstart/oci-weblo…
skommala Mar 6, 2024
2cfb830
JCS-14392 - Issue with volume attachments on scale-out (#245)
roberto-sanchez-herrera Mar 22, 2024
7ba4ab2
Merge branch 'main' into development
skommala Mar 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions terraform/modules/compute/wls_compute/wls_compute.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2023, Oracle and/or its affiliates.
# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
# Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.

module "compute-keygen" {
Expand All @@ -9,7 +9,7 @@ module "wls-instances" {

source = "../instance"

instance_params = { for x in range(var.num_vm_instances) : "${local.host_label}-${x}" => {
instance_params = { for x in range(var.num_vm_instances) : "${local.host_label}-${format("%02d", x)}" => {

availability_domain = var.use_regional_subnet ? local.ad_names[(x + local.admin_ad_index) % length(local.ad_names)] : var.availability_domain

Expand Down
10 changes: 5 additions & 5 deletions terraform/modules/compute/wls_compute/wls_volume.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# Copyright (c) 2023, Oracle and/or its affiliates.
# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
# Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.

module "middleware-volume" {
source = "../volume"
bv_params = { for x in range(var.num_vm_instances) : "${var.resource_name_prefix}-mw-block-${x}" => {
bv_params = { for x in range(var.num_vm_instances) : "${var.resource_name_prefix}-mw-block-${format("%02d", x)}" => {
ad = var.use_regional_subnet ? local.ad_names[(x + local.admin_ad_index) % length(local.ad_names)] : var.availability_domain
compartment_id = var.compartment_id
display_name = "${var.resource_name_prefix}-mw-block-${x}"
Expand All @@ -18,7 +18,7 @@ module "middleware-volume" {

module "data-volume" {
source = "../volume"
bv_params = { for x in range(var.num_vm_instances) : "${var.resource_name_prefix}-data-block-${x}" => {
bv_params = { for x in range(var.num_vm_instances) : "${var.resource_name_prefix}-data-block-${format("%02d", x)}" => {
ad = var.use_regional_subnet ? local.ad_names[(x + local.admin_ad_index) % length(local.ad_names)] : var.availability_domain
compartment_id = var.compartment_id
display_name = "${var.resource_name_prefix}-data-block-${x}"
Expand All @@ -35,7 +35,7 @@ module "middleware_volume_attach" {

bv_params = { empty = { ad = "", compartment_id = "", display_name = "", bv_size = 0, defined_tags = { def = "" }, freeform_tags = { free = "" } } }

bv_attach_params = { for x in range(var.num_vm_instances * var.num_volumes) : "${var.resource_name_prefix}-block-volume-attach-${x}" => {
bv_attach_params = { for x in range(var.num_vm_instances * var.num_volumes) : "${var.resource_name_prefix}-block-volume-attach-${format("%02d", x)}" => {
display_name = "${var.resource_name_prefix}-block-volume-attach-${x}"
attachment_type = "iscsi"
instance_id = module.wls-instances.instance_ids[x / var.num_volumes]
Expand All @@ -49,7 +49,7 @@ module "data_volume_attach" {

bv_params = { empty = { ad = "", compartment_id = "", display_name = "", bv_size = 0, defined_tags = { def = "" }, freeform_tags = { free = "" } } }

bv_attach_params = { for x in range(var.num_vm_instances * var.num_volumes) : "${var.resource_name_prefix}-block-volume-attach-${x}" => {
bv_attach_params = { for x in range(var.num_vm_instances * var.num_volumes) : "${var.resource_name_prefix}-block-volume-attach-${format("%02d", x)}" => {
display_name = "${var.resource_name_prefix}-block-volume-attach-${x}"
attachment_type = "iscsi"
instance_id = module.wls-instances.instance_ids[x / var.num_volumes]
Expand Down