Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion examples/create_vpc/modules/landing_zone_vpc/main.tf
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module "create_vpc" {
source = "terraform-ibm-modules/landing-zone-vpc/ibm"
version = "7.18.2"
version = "7.19.0"
prefix = local.prefix
region = local.region
tags = local.tags
Expand Down
8 changes: 4 additions & 4 deletions modules/bootstrap/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ module "ssh_key" {
module "bastion_sg" {
count = 1
source = "terraform-ibm-modules/security-group/ibm"
version = "2.6.1"
version = "2.6.2"
add_ibm_cloud_internal_rules = true
resource_group = var.resource_group
security_group_name = format("%s-bastion-sg", local.prefix)
Expand All @@ -19,7 +19,7 @@ module "bastion_sg" {
module "bastion_sg_with_ldap_update" {
count = var.ldap_server == "null" ? 0 : 1
source = "terraform-ibm-modules/security-group/ibm"
version = "2.6.1"
version = "2.6.2"
resource_group = var.resource_group
add_ibm_cloud_internal_rules = true
use_existing_security_group_id = true
Expand All @@ -32,7 +32,7 @@ module "bastion_sg_with_ldap_update" {
module "existing_bastion_sg_update" {
count = var.bastion_security_group_id != null ? 1 : 0
source = "terraform-ibm-modules/security-group/ibm"
version = "2.6.1"
version = "2.6.2"
resource_group = var.resource_group
add_ibm_cloud_internal_rules = true
use_existing_security_group_id = true
Expand All @@ -45,7 +45,7 @@ module "existing_bastion_sg_update" {
module "bastion_vsi" {
count = var.bastion_instance_name != null ? 0 : 1
source = "terraform-ibm-modules/landing-zone-vsi/ibm"
version = "4.0.0"
version = "4.2.0"
vsi_per_subnet = 1
create_security_group = false
security_group = null
Expand Down
25 changes: 13 additions & 12 deletions modules/database/mysql/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,17 @@
################################################################################

module "db" {
source = "terraform-ibm-modules/icd-mysql/ibm"
version = "1.2.7"
resource_group_id = var.resource_group_id
name = var.name
region = var.region
service_endpoints = var.service_endpoints
mysql_version = var.mysql_version
admin_pass = var.adminpassword
members = var.members
member_memory_mb = var.memory
member_disk_mb = var.disks
member_cpu_count = var.vcpu
source = "terraform-ibm-modules/icd-mysql/ibm"
version = "1.3.9"
resource_group_id = var.resource_group_id
name = var.name
region = var.region
service_endpoints = var.service_endpoints
mysql_version = var.mysql_version
admin_pass = var.adminpassword
members = var.members
member_memory_mb = var.memory
member_disk_mb = var.disks
member_cpu_count = var.vcpu
member_host_flavor = var.host_flavour
}
6 changes: 6 additions & 0 deletions modules/database/mysql/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,12 @@ variable "vcpu" {
default = null
}

variable "host_flavour" {
description = "Allocated host flavor per member."
type = string
default = null
}

variable "service_endpoints" {
description = "The service endpoints"
type = string
Expand Down
2 changes: 1 addition & 1 deletion modules/landing_zone/main.tf
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
module "landing_zone" {
count = var.enable_landing_zone ? 1 : 0
source = "terraform-ibm-modules/landing-zone/ibm"
version = "5.24.3"
version = "6.0.0"
prefix = local.prefix
region = local.region
tags = local.tags
Expand Down
27 changes: 12 additions & 15 deletions modules/landing_zone_vsi/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ module "compute_key" {
module "compute_sg" {
count = local.enable_compute ? 1 : 0
source = "terraform-ibm-modules/security-group/ibm"
version = "2.6.1"
version = "2.6.2"
add_ibm_cloud_internal_rules = true
resource_group = var.resource_group
security_group_name = format("%s-cluster-sg", local.prefix)
Expand All @@ -19,7 +19,7 @@ module "compute_sg" {
module "compute_sg_with_ldap_connection" {
count = var.ldap_server == "null" ? 0 : 1
source = "terraform-ibm-modules/security-group/ibm"
version = "2.6.1"
version = "2.6.2"
resource_group = var.resource_group
add_ibm_cloud_internal_rules = true
use_existing_security_group_id = true
Expand All @@ -32,7 +32,7 @@ module "compute_sg_with_ldap_connection" {
module "ssh_connection_to_login_node_via_cluster_nodes" {
count = var.bastion_instance_name != null ? 1 : 0
source = "terraform-ibm-modules/security-group/ibm"
version = "2.6.1"
version = "2.6.2"
resource_group = var.resource_group
add_ibm_cloud_internal_rules = true
use_existing_security_group_id = true
Expand All @@ -45,7 +45,7 @@ module "ssh_connection_to_login_node_via_cluster_nodes" {
module "nfs_storage_sg" {
count = var.storage_security_group_id != null ? 1 : 0
source = "terraform-ibm-modules/security-group/ibm"
version = "2.6.1"
version = "2.6.2"
resource_group = var.resource_group
add_ibm_cloud_internal_rules = true
use_existing_security_group_id = true
Expand All @@ -55,12 +55,10 @@ module "nfs_storage_sg" {
}

module "management_vsi" {
count = 1
# count = length(var.management_instances)
source = "terraform-ibm-modules/landing-zone-vsi/ibm"
version = "4.0.0"
vsi_per_subnet = 1
# vsi_per_subnet = var.management_instances[count.index]["count"]
count = 1
source = "terraform-ibm-modules/landing-zone-vsi/ibm"
version = "4.2.0"
vsi_per_subnet = 1
create_security_group = false
security_group = null
image_id = local.image_mapping_entry_found ? local.new_image_id : data.ibm_is_image.management[0].id
Expand All @@ -83,7 +81,7 @@ module "management_vsi" {
module "management_candidate_vsi" {
count = var.management_node_count - 1
source = "terraform-ibm-modules/landing-zone-vsi/ibm"
version = "4.0.0"
version = "4.2.0"
create_security_group = false
security_group = null
security_group_ids = module.compute_sg[*].security_group_id
Expand All @@ -106,7 +104,7 @@ module "management_candidate_vsi" {
module "login_vsi" {
count = 1
source = "terraform-ibm-modules/landing-zone-vsi/ibm"
version = "4.0.0"
version = "4.2.0"
vsi_per_subnet = 1
create_security_group = false
security_group = null
Expand All @@ -128,10 +126,9 @@ module "login_vsi" {
}

module "ldap_vsi" {
count = local.ldap_enable
# count = length(var.management_instances)
count = local.ldap_enable
source = "terraform-ibm-modules/landing-zone-vsi/ibm"
version = "4.0.0"
version = "4.2.0"
vsi_per_subnet = 1
create_security_group = false
security_group = null
Expand Down
6 changes: 3 additions & 3 deletions modules/security/scc/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ locals {

module "event_notification" {
source = "terraform-ibm-modules/event-notifications/ibm"
version = "1.4.4"
version = "1.10.18"
resource_group_id = var.rg
name = "${var.prefix}-scc-event_notification"
plan = var.event_notification_plan
Expand All @@ -29,7 +29,7 @@ module "event_notification" {

module "create_scc_instance" {
source = "terraform-ibm-modules/scc/ibm"
version = "1.6.0"
version = "1.8.9"
instance_name = "${var.prefix}-scc-instance"
plan = var.scc_plan
region = local.scc_region
Expand All @@ -47,7 +47,7 @@ module "create_scc_instance" {
module "create_profile_attachment" {
count = var.scc_profile == null || var.scc_profile == "" ? 0 : 1
source = "terraform-ibm-modules/scc/ibm//modules/attachment"
version = "1.6.0"
version = "1.8.9"
profile_name = var.scc_profile
profile_version = var.scc_profile_version
scc_instance_id = module.create_scc_instance.guid
Expand Down
2 changes: 1 addition & 1 deletion solutions/hpc/locals.tf
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ locals {
locals {
mysql_version = "8.0"
db_service_endpoints = "private"
db_template = [3, 12288, 122880, 3]
db_template = [3, 12288, 122880, 3, "multitenant"]
}

###########################################################################
Expand Down
1 change: 1 addition & 0 deletions solutions/hpc/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ module "db" {
memory = local.db_template[1]
disks = local.db_template[2]
vcpu = local.db_template[3]
host_flavour = local.db_template[4]
}

module "ce_project" {
Expand Down