Skip to content

Commit 9381805

Browse files
nupurg-ibmNupur Goyal
nupurg-ibm
and
Nupur Goyal
authored
Update module versions (#182)
* Updating module versions * fixing observability issue * Adding DB host flavour --------- Co-authored-by: Nupur Goyal <nupurgoyal@Nupurs-MacBook-Pro.local>
1 parent 407feff commit 9381805

File tree

9 files changed

+42
-37
lines changed

9 files changed

+42
-37
lines changed

‎examples/create_vpc/modules/landing_zone_vpc/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module "create_vpc" {
22
source = "terraform-ibm-modules/landing-zone-vpc/ibm"
3-
version = "7.18.2"
3+
version = "7.19.0"
44
prefix = local.prefix
55
region = local.region
66
tags = local.tags

‎modules/bootstrap/main.tf

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ module "ssh_key" {
77
module "bastion_sg" {
88
count = 1
99
source = "terraform-ibm-modules/security-group/ibm"
10-
version = "2.6.1"
10+
version = "2.6.2"
1111
add_ibm_cloud_internal_rules = true
1212
resource_group = var.resource_group
1313
security_group_name = format("%s-bastion-sg", local.prefix)
@@ -19,7 +19,7 @@ module "bastion_sg" {
1919
module "bastion_sg_with_ldap_update" {
2020
count = var.ldap_server == "null" ? 0 : 1
2121
source = "terraform-ibm-modules/security-group/ibm"
22-
version = "2.6.1"
22+
version = "2.6.2"
2323
resource_group = var.resource_group
2424
add_ibm_cloud_internal_rules = true
2525
use_existing_security_group_id = true
@@ -32,7 +32,7 @@ module "bastion_sg_with_ldap_update" {
3232
module "existing_bastion_sg_update" {
3333
count = var.bastion_security_group_id != null ? 1 : 0
3434
source = "terraform-ibm-modules/security-group/ibm"
35-
version = "2.6.1"
35+
version = "2.6.2"
3636
resource_group = var.resource_group
3737
add_ibm_cloud_internal_rules = true
3838
use_existing_security_group_id = true
@@ -45,7 +45,7 @@ module "existing_bastion_sg_update" {
4545
module "bastion_vsi" {
4646
count = var.bastion_instance_name != null ? 0 : 1
4747
source = "terraform-ibm-modules/landing-zone-vsi/ibm"
48-
version = "4.0.0"
48+
version = "4.2.0"
4949
vsi_per_subnet = 1
5050
create_security_group = false
5151
security_group = null

‎modules/database/mysql/main.tf

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,17 @@
99
################################################################################
1010

1111
module "db" {
12-
source = "terraform-ibm-modules/icd-mysql/ibm"
13-
version = "1.2.7"
14-
resource_group_id = var.resource_group_id
15-
name = var.name
16-
region = var.region
17-
service_endpoints = var.service_endpoints
18-
mysql_version = var.mysql_version
19-
admin_pass = var.adminpassword
20-
members = var.members
21-
member_memory_mb = var.memory
22-
member_disk_mb = var.disks
23-
member_cpu_count = var.vcpu
12+
source = "terraform-ibm-modules/icd-mysql/ibm"
13+
version = "1.3.9"
14+
resource_group_id = var.resource_group_id
15+
name = var.name
16+
region = var.region
17+
service_endpoints = var.service_endpoints
18+
mysql_version = var.mysql_version
19+
admin_pass = var.adminpassword
20+
members = var.members
21+
member_memory_mb = var.memory
22+
member_disk_mb = var.disks
23+
member_cpu_count = var.vcpu
24+
member_host_flavor = var.host_flavour
2425
}

‎modules/database/mysql/variables.tf

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,12 @@ variable "vcpu" {
4949
default = null
5050
}
5151

52+
variable "host_flavour" {
53+
description = "Allocated host flavor per member."
54+
type = string
55+
default = null
56+
}
57+
5258
variable "service_endpoints" {
5359
description = "The service endpoints"
5460
type = string

‎modules/landing_zone/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
module "landing_zone" {
22
count = var.enable_landing_zone ? 1 : 0
33
source = "terraform-ibm-modules/landing-zone/ibm"
4-
version = "5.24.3"
4+
version = "6.0.0"
55
prefix = local.prefix
66
region = local.region
77
tags = local.tags

‎modules/landing_zone_vsi/main.tf

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ module "compute_key" {
77
module "compute_sg" {
88
count = local.enable_compute ? 1 : 0
99
source = "terraform-ibm-modules/security-group/ibm"
10-
version = "2.6.1"
10+
version = "2.6.2"
1111
add_ibm_cloud_internal_rules = true
1212
resource_group = var.resource_group
1313
security_group_name = format("%s-cluster-sg", local.prefix)
@@ -19,7 +19,7 @@ module "compute_sg" {
1919
module "compute_sg_with_ldap_connection" {
2020
count = var.ldap_server == "null" ? 0 : 1
2121
source = "terraform-ibm-modules/security-group/ibm"
22-
version = "2.6.1"
22+
version = "2.6.2"
2323
resource_group = var.resource_group
2424
add_ibm_cloud_internal_rules = true
2525
use_existing_security_group_id = true
@@ -32,7 +32,7 @@ module "compute_sg_with_ldap_connection" {
3232
module "ssh_connection_to_login_node_via_cluster_nodes" {
3333
count = var.bastion_instance_name != null ? 1 : 0
3434
source = "terraform-ibm-modules/security-group/ibm"
35-
version = "2.6.1"
35+
version = "2.6.2"
3636
resource_group = var.resource_group
3737
add_ibm_cloud_internal_rules = true
3838
use_existing_security_group_id = true
@@ -45,7 +45,7 @@ module "ssh_connection_to_login_node_via_cluster_nodes" {
4545
module "nfs_storage_sg" {
4646
count = var.storage_security_group_id != null ? 1 : 0
4747
source = "terraform-ibm-modules/security-group/ibm"
48-
version = "2.6.1"
48+
version = "2.6.2"
4949
resource_group = var.resource_group
5050
add_ibm_cloud_internal_rules = true
5151
use_existing_security_group_id = true
@@ -55,12 +55,10 @@ module "nfs_storage_sg" {
5555
}
5656

5757
module "management_vsi" {
58-
count = 1
59-
# count = length(var.management_instances)
60-
source = "terraform-ibm-modules/landing-zone-vsi/ibm"
61-
version = "4.0.0"
62-
vsi_per_subnet = 1
63-
# vsi_per_subnet = var.management_instances[count.index]["count"]
58+
count = 1
59+
source = "terraform-ibm-modules/landing-zone-vsi/ibm"
60+
version = "4.2.0"
61+
vsi_per_subnet = 1
6462
create_security_group = false
6563
security_group = null
6664
image_id = local.image_mapping_entry_found ? local.new_image_id : data.ibm_is_image.management[0].id
@@ -83,7 +81,7 @@ module "management_vsi" {
8381
module "management_candidate_vsi" {
8482
count = var.management_node_count - 1
8583
source = "terraform-ibm-modules/landing-zone-vsi/ibm"
86-
version = "4.0.0"
84+
version = "4.2.0"
8785
create_security_group = false
8886
security_group = null
8987
security_group_ids = module.compute_sg[*].security_group_id
@@ -106,7 +104,7 @@ module "management_candidate_vsi" {
106104
module "login_vsi" {
107105
count = 1
108106
source = "terraform-ibm-modules/landing-zone-vsi/ibm"
109-
version = "4.0.0"
107+
version = "4.2.0"
110108
vsi_per_subnet = 1
111109
create_security_group = false
112110
security_group = null
@@ -128,10 +126,9 @@ module "login_vsi" {
128126
}
129127

130128
module "ldap_vsi" {
131-
count = local.ldap_enable
132-
# count = length(var.management_instances)
129+
count = local.ldap_enable
133130
source = "terraform-ibm-modules/landing-zone-vsi/ibm"
134-
version = "4.0.0"
131+
version = "4.2.0"
135132
vsi_per_subnet = 1
136133
create_security_group = false
137134
security_group = null

‎modules/security/scc/main.tf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ locals {
1818

1919
module "event_notification" {
2020
source = "terraform-ibm-modules/event-notifications/ibm"
21-
version = "1.4.4"
21+
version = "1.10.18"
2222
resource_group_id = var.rg
2323
name = "${var.prefix}-scc-event_notification"
2424
plan = var.event_notification_plan
@@ -29,7 +29,7 @@ module "event_notification" {
2929

3030
module "create_scc_instance" {
3131
source = "terraform-ibm-modules/scc/ibm"
32-
version = "1.6.0"
32+
version = "1.8.9"
3333
instance_name = "${var.prefix}-scc-instance"
3434
plan = var.scc_plan
3535
region = local.scc_region
@@ -47,7 +47,7 @@ module "create_scc_instance" {
4747
module "create_profile_attachment" {
4848
count = var.scc_profile == null || var.scc_profile == "" ? 0 : 1
4949
source = "terraform-ibm-modules/scc/ibm//modules/attachment"
50-
version = "1.6.0"
50+
version = "1.8.9"
5151
profile_name = var.scc_profile
5252
profile_version = var.scc_profile_version
5353
scc_instance_id = module.create_scc_instance.guid

‎solutions/hpc/locals.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ locals {
226226
locals {
227227
mysql_version = "8.0"
228228
db_service_endpoints = "private"
229-
db_template = [3, 12288, 122880, 3]
229+
db_template = [3, 12288, 122880, 3, "multitenant"]
230230
}
231231

232232
###########################################################################

‎solutions/hpc/main.tf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ module "db" {
6363
memory = local.db_template[1]
6464
disks = local.db_template[2]
6565
vcpu = local.db_template[3]
66+
host_flavour = local.db_template[4]
6667
}
6768

6869
module "ce_project" {

0 commit comments

Comments
 (0)