feat: added new input variable member_host_flavor and updated default value of memory_mb to 8192.<br><br>Reference: [Cloud Database Hosting Models](https://cloud.ibm.com/docs/cloud-databases?topic=cloud-databases-hosting-models)<br><br>The [host model switching](https://cloud.ibm.com/docs/cloud-databases?topic=cloud-databases-hosting-models&interface=api#hosting-models-switching) section has details of the migrations that the service is rolling out. All instances will have to be switched and the [time line](https://cloud.ibm.com/docs/cloud-databases?topic=cloud-databases-hosting-models&interface=api#hosting-model-transition-timeline) for the migrations is outlined.<br><br>During the transition both existing and new models are supported.<br><br>Users of this module should consider the changes being implemented by the service. It is recommended that new deployments use the shared or isolated compute models to start, by specifying the member_host_flavor. It is recommended that existing deployments make updates to control the upgrade process by specifying shared or isolate compute configurations and the resource required to run the service, by adding the member_host_flavor. (#368)

Author: shemau

README.md

@@ -93,8 +93,9 @@ You need the following permissions to run this module.
 | <a name="input_instance_name"></a> [instance\_name](#input\_instance\_name) | The name to give the Redis instance. | `string` | n/a | yes |
 | <a name="input_kms_encryption_enabled"></a> [kms\_encryption\_enabled](#input\_kms\_encryption\_enabled) | Set this to true to control the encryption keys used to encrypt the data that you store in IBM Cloud® Databases. If set to false, the data is encrypted by using randomly generated keys. For more info on Key Protect integration, see https://cloud.ibm.com/docs/cloud-databases?topic=cloud-databases-key-protect. For more info on HPCS integration, see https://cloud.ibm.com/docs/cloud-databases?topic=cloud-databases-hpcs | `bool` | `false` | no |
 | <a name="input_kms_key_crn"></a> [kms\_key\_crn](#input\_kms\_key\_crn) | The root key CRN of a Key Management Services like Key Protect or Hyper Protect Crypto Service (HPCS) that you want to use for disk encryption. Only used if var.kms\_encryption\_enabled is set to true. | `string` | `null` | no |
+| <a name="input_member_host_flavor"></a> [member\_host\_flavor](#input\_member\_host\_flavor) | Allocated host flavor per member. [Learn more](https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/resources/database#host_flavor). | `string` | `null` | no |
 | <a name="input_members"></a> [members](#input\_members) | Allocated number of members. Members can be scaled up but not down. | `number` | `2` | no |
-| <a name="input_memory_mb"></a> [memory\_mb](#input\_memory\_mb) | Allocated memory per member. For more information, see https://cloud.ibm.com/docs/databases-for-redis?topic=databases-for-redis-resources-scaling | `number` | `1024` | no |
+| <a name="input_memory_mb"></a> [memory\_mb](#input\_memory\_mb) | Allocated memory per member. For more information, see https://cloud.ibm.com/docs/databases-for-redis?topic=databases-for-redis-resources-scaling | `number` | `4096` | no |
 | <a name="input_redis_version"></a> [redis\_version](#input\_redis\_version) | Version of the Redis instance to provision. If no value is passed, the current preferred version of IBM Cloud Databases is used. | `string` | `null` | no |
 | <a name="input_region"></a> [region](#input\_region) | The region where you want to deploy your instance. | `string` | `"us-south"` | no |
 | <a name="input_resource_group_id"></a> [resource\_group\_id](#input\_resource\_group\_id) | The resource group ID where the Redis instance will be created. | `string` | n/a | yes |

examples/advanced/main.tf

@@ -93,6 +93,7 @@ module "icd_redis" {
   kms_key_crn                = module.key_protect_all_inclusive.keys["icd.${var.prefix}-redis"].crn
   tags                       = var.resource_tags
   service_credential_names   = var.service_credential_names
+  member_host_flavor         = "multitenant"
   cbr_rules = [
     {
       description      = "sample rule"

examples/advanced/outputs.tf

@@ -30,11 +30,11 @@ output "service_credentials_object" {
 }
 
 output "hostname" {
-  description = "Postgresql instance hostname"
+  description = "Redis instance hostname"
   value       = module.icd_redis.hostname
 }
 
 output "port" {
-  description = "Postgresql instance port"
+  description = "Redis instance port"
   value       = module.icd_redis.port
 }

examples/fscloud/main.tf

@@ -64,6 +64,7 @@ module "redis" {
   existing_kms_instance_guid = var.existing_kms_instance_guid
   service_credential_names   = var.service_credential_names
   auto_scaling               = var.auto_scaling
+  member_host_flavor         = "b3c.4x16.encrypted"
   backup_encryption_key_crn  = var.backup_encryption_key_crn
   backup_crn                 = var.backup_crn
   cbr_rules = [

main.tf

@@ -22,6 +22,9 @@ locals {
   # Determine if auto scaling is enabled
   auto_scaling_enabled = var.auto_scaling == null ? [] : [1]
 
+  # Determine if host_flavor is used
+  host_flavor_set = var.member_host_flavor != null ? true : false
+
   # Determine what KMS service is being used for database encryption
   kms_service = var.kms_key_crn != null ? (
     can(regex(".*kms.*", var.kms_key_crn)) ? "kms" : (
@@ -85,19 +88,65 @@ resource "ibm_database" "redis_database" {
     }
   }
 
-  group {
-    group_id = "member"
-    memory {
-      allocation_mb = var.memory_mb
-    }
-    disk {
-      allocation_mb = var.disk_mb
+  ## This for_each block is NOT a loop to attach to multiple group blocks.
+  ## This is used to conditionally add one, OR, the other group block depending on var.local.host_flavor_set
+  ## This block is for if host_flavor IS set to specific pre-defined host sizes and not set to "multitenant"
+  dynamic "group" {
+    for_each = local.host_flavor_set && var.member_host_flavor != "multitenant" ? [1] : []
+    content {
+      group_id = "member" # Only member type is allowed for IBM Cloud Databases
+      host_flavor {
+        id = var.member_host_flavor
+      }
+      disk {
+        allocation_mb = var.disk_mb
+      }
+      members {
+        allocation_count = var.members
+      }
     }
-    cpu {
-      allocation_count = var.cpu_count
+  }
+
+  ## This block is for if host_flavor IS set to "multitenant"
+  dynamic "group" {
+    for_each = local.host_flavor_set && var.member_host_flavor == "multitenant" ? [1] : []
+    content {
+      group_id = "member" # Only member type is allowed for IBM Cloud Databases
+      host_flavor {
+        id = var.member_host_flavor
+      }
+      disk {
+        allocation_mb = var.disk_mb
+      }
+      memory {
+        allocation_mb = var.memory_mb
+      }
+      cpu {
+        allocation_count = var.cpu_count
+      }
+      members {
+        allocation_count = var.members
+      }
     }
-    members {
-      allocation_count = var.members
+  }
+
+  ## This block is for if host_flavor IS NOT set
+  dynamic "group" {
+    for_each = local.host_flavor_set ? [] : [1]
+    content {
+      group_id = "member" # Only member type is allowed for IBM Cloud Databases
+      memory {
+        allocation_mb = var.memory_mb
+      }
+      disk {
+        allocation_mb = var.disk_mb
+      }
+      cpu {
+        allocation_count = var.cpu_count
+      }
+      members {
+        allocation_count = var.members
+      }
     }
   }
 

modules/fscloud/README.md

@@ -41,8 +41,9 @@ No resources.
 | <a name="input_existing_kms_instance_guid"></a> [existing\_kms\_instance\_guid](#input\_existing\_kms\_instance\_guid) | The GUID of the Hyper Protect Crypto Services instance. | `string` | n/a | yes |
 | <a name="input_instance_name"></a> [instance\_name](#input\_instance\_name) | The name to give the Redis instance. | `string` | n/a | yes |
 | <a name="input_kms_key_crn"></a> [kms\_key\_crn](#input\_kms\_key\_crn) | The root key CRN of the Hyper Protect Crypto Service (HPCS) to use for disk encryption. | `string` | n/a | yes |
+| <a name="input_member_host_flavor"></a> [member\_host\_flavor](#input\_member\_host\_flavor) | Allocated host flavor per member. [Learn more](https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/resources/database#host_flavor). | `string` | `null` | no |
 | <a name="input_members"></a> [members](#input\_members) | Allocated number of members. Members can be scaled up but not down. | `number` | `2` | no |
-| <a name="input_memory_mb"></a> [memory\_mb](#input\_memory\_mb) | Allocated memory per member. For more information, see https://cloud.ibm.com/docs/databases-for-redis?topic=databases-for-redis-resources-scaling | `number` | `1024` | no |
+| <a name="input_memory_mb"></a> [memory\_mb](#input\_memory\_mb) | Allocated memory per member. For more information, see https://cloud.ibm.com/docs/databases-for-redis?topic=databases-for-redis-resources-scaling | `number` | `4096` | no |
 | <a name="input_redis_version"></a> [redis\_version](#input\_redis\_version) | The version of redis. If null, the current default ICD redis version is used. | `string` | `null` | no |
 | <a name="input_region"></a> [region](#input\_region) | The region where you want to deploy your instance. Must be the same region as the Hyper Protect Crypto Services instance. | `string` | `"us-south"` | no |
 | <a name="input_resource_group_id"></a> [resource\_group\_id](#input\_resource\_group\_id) | The resource group ID where the Redis instance will be created. | `string` | n/a | yes |

modules/fscloud/main.tf

@@ -10,6 +10,7 @@ module "redis" {
   configuration                 = var.configuration
   cpu_count                     = var.cpu_count
   memory_mb                     = var.memory_mb
+  member_host_flavor            = var.member_host_flavor
   members                       = var.members
   admin_pass                    = var.admin_pass
   users                         = var.users

modules/fscloud/variables.tf

@@ -40,7 +40,7 @@ variable "cpu_count" {
 variable "memory_mb" {
   description = "Allocated memory per member. For more information, see https://cloud.ibm.com/docs/databases-for-redis?topic=databases-for-redis-resources-scaling"
   type        = number
-  default     = 1024
+  default     = 4096
 }
 
 variable "disk_mb" {
@@ -56,6 +56,12 @@ variable "members" {
   # Validation is done in terraform plan phase by IBM provider, so no need to add any extra validation here
 }
 
+variable "member_host_flavor" {
+  type        = string
+  description = "Allocated host flavor per member. [Learn more](https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/resources/database#host_flavor)."
+  default     = null
+}
+
 variable "admin_pass" {
   type        = string
   description = "The password for the database administrator. If the admin password is null then the admin user ID cannot be accessed. More users can be specified in a user block."

variables.tf

@@ -49,7 +49,7 @@ variable "cpu_count" {
 variable "memory_mb" {
   description = "Allocated memory per member. For more information, see https://cloud.ibm.com/docs/databases-for-redis?topic=databases-for-redis-resources-scaling"
   type        = number
-  default     = 1024
+  default     = 4096
   # Validation is done in terraform plan phase by IBM provider, so no need to add any extra validation here
 }
 
@@ -60,6 +60,13 @@ variable "disk_mb" {
   # Validation is done in terraform plan phase by IBM provider, so no need to add any extra validation here
 }
 
+variable "member_host_flavor" {
+  type        = string
+  description = "Allocated host flavor per member. [Learn more](https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/resources/database#host_flavor)."
+  default     = null
+  # Validation is done in the Terraform plan phase by the IBM provider, so no need to add extra validation here.
+}
+
 variable "members" {
   description = "Allocated number of members. Members can be scaled up but not down."
   type        = number