diff --git a/examples/create_vpc/modules/landing_zone_vpc/main.tf b/examples/create_vpc/modules/landing_zone_vpc/main.tf index ea226aec..cfa62711 100644 --- a/examples/create_vpc/modules/landing_zone_vpc/main.tf +++ b/examples/create_vpc/modules/landing_zone_vpc/main.tf @@ -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 diff --git a/modules/bootstrap/main.tf b/modules/bootstrap/main.tf index 7975823b..921fe11e 100644 --- a/modules/bootstrap/main.tf +++ b/modules/bootstrap/main.tf @@ -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) @@ -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 @@ -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 @@ -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 diff --git a/modules/database/mysql/main.tf b/modules/database/mysql/main.tf index eef5f5ef..130ad82e 100644 --- a/modules/database/mysql/main.tf +++ b/modules/database/mysql/main.tf @@ -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 } diff --git a/modules/database/mysql/variables.tf b/modules/database/mysql/variables.tf index 7b9120fd..3ca81130 100644 --- a/modules/database/mysql/variables.tf +++ b/modules/database/mysql/variables.tf @@ -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 diff --git a/modules/landing_zone/main.tf b/modules/landing_zone/main.tf index 6df2c29f..f4ddca0a 100644 --- a/modules/landing_zone/main.tf +++ b/modules/landing_zone/main.tf @@ -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 diff --git a/modules/landing_zone_vsi/main.tf b/modules/landing_zone_vsi/main.tf index cd85c984..b7ad2f4e 100644 --- a/modules/landing_zone_vsi/main.tf +++ b/modules/landing_zone_vsi/main.tf @@ -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) @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/modules/security/scc/main.tf b/modules/security/scc/main.tf index ac8dce9a..6cf165af 100644 --- a/modules/security/scc/main.tf +++ b/modules/security/scc/main.tf @@ -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 @@ -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 @@ -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 diff --git a/solutions/hpc/locals.tf b/solutions/hpc/locals.tf index d59a97ce..dba38eb4 100644 --- a/solutions/hpc/locals.tf +++ b/solutions/hpc/locals.tf @@ -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"] } ########################################################################### diff --git a/solutions/hpc/main.tf b/solutions/hpc/main.tf index 59c1bfa1..d3e5ac63 100644 --- a/solutions/hpc/main.tf +++ b/solutions/hpc/main.tf @@ -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" {