chore: powervs_instances

Author: surajsbharadwaj

ibm_catalog.json

@@ -691,6 +691,11 @@
               ],
               "custom_config": {}
             },
+            {
+              "key": "powervs_instance_count",
+              "default_value": "",
+              "required": true
+            },
             {
               "key": "tshirt_size",
               "type": "object",

solutions/standard-plus-vsi/README.md

@@ -91,6 +91,7 @@ This example sets up the following infrastructure:
 | <a name="input_network_services_vsi_profile"></a> [network\_services\_vsi\_profile](#input\_network\_services\_vsi\_profile) | Compute profile configuration of the network services vsi (cpu and memory configuration). Must be one of the supported profiles. See [here](https://cloud.ibm.com/docs/vpc?topic=vpc-profiles&interface=ui). | `string` | `"cx2-2x4"` | no |
 | <a name="input_nfs_server_config"></a> [nfs\_server\_config](#input\_nfs\_server\_config) | Configuration for the NFS server. 'size' is in GB, 'iops' is maximum input/output operation performance bandwidth per second, 'mount\_path' defines the target mount point on os. Set 'configure\_nfs\_server' to false to ignore creating file storage share. | <pre>object({<br/>    size       = number<br/>    iops       = number<br/>    mount_path = string<br/>  })</pre> | <pre>{<br/>  "iops": 600,<br/>  "mount_path": "/nfs",<br/>  "size": 200<br/>}</pre> | no |
 | <a name="input_powervs_backup_network"></a> [powervs\_backup\_network](#input\_powervs\_backup\_network) | Name of the IBM Cloud PowerVS backup network and CIDR to create. | <pre>object({<br/>    name = string<br/>    cidr = string<br/>  })</pre> | <pre>{<br/>  "cidr": "10.52.0.0/24",<br/>  "name": "bkp_net"<br/>}</pre> | no |
+| <a name="input_powervs_instance_count"></a> [powervs\_instance\_count](#input\_powervs\_instance\_count) | Number of PowerVS instances to create. | `number` | `1` | no |
 | <a name="input_powervs_management_network"></a> [powervs\_management\_network](#input\_powervs\_management\_network) | Name of the IBM Cloud PowerVS management subnet and CIDR to create. | <pre>object({<br/>    name = string<br/>    cidr = string<br/>  })</pre> | <pre>{<br/>  "cidr": "10.51.0.0/24",<br/>  "name": "mgmt_net"<br/>}</pre> | no |
 | <a name="input_powervs_resource_group_name"></a> [powervs\_resource\_group\_name](#input\_powervs\_resource\_group\_name) | Existing IBM Cloud resource group name. | `string` | `"Default"` | no |
 | <a name="input_powervs_zone"></a> [powervs\_zone](#input\_powervs\_zone) | IBM Cloud data center location where IBM PowerVS infrastructure will be created. | `string` | n/a | yes |

solutions/standard-plus-vsi/main.tf

@@ -47,14 +47,15 @@ module "powervs_instance" {
   source     = "terraform-ibm-modules/powervs-instance/ibm"
   version    = "2.6.2"
   providers  = { ibm = ibm.ibm-pi }
+  count      = var.powervs_instance_count
   depends_on = [time_sleep.wait_for_dependencies]
 
   pi_workspace_guid      = module.standard.powervs_workspace_guid
   pi_ssh_public_key_name = module.standard.powervs_ssh_public_key.name
 
   pi_image_id                = local.pi_instance.pi_image_id
   pi_networks                = local.pi_instance.pi_networks
-  pi_instance_name           = local.pi_instance.pi_instance_name
+  pi_instance_name           = "${local.pi_instance.pi_instance_name}-${count.index + 1}"
   pi_sap_profile_id          = local.pi_instance.pi_sap_profile_id
   pi_server_type             = local.pi_instance.pi_server_type
   pi_number_of_processors    = local.pi_instance.pi_number_of_processors
@@ -82,18 +83,18 @@ module "powervs_instance" {
 ######################################################
 resource "terraform_data" "aix_init" {
 
-  count      = local.pi_instance_os_type == "aix" ? 1 : 0
+  count      = local.pi_instance_os_type == "aix" ? var.powervs_instance_count : 0
   depends_on = [module.standard, module.powervs_instance]
 
   triggers_replace = {
     "network_services_config"  = local.network_services_config,
-    "pi_storage_configuration" = module.powervs_instance.pi_storage_configuration
+    "pi_storage_configuration" = module.powervs_instance[count.index].pi_storage_configuration
   }
   connection {
     type         = "ssh"
     user         = "root"
     bastion_host = module.standard.access_host_or_ip
-    host         = module.powervs_instance.pi_instance_primary_ip
+    host         = module.powervs_instance[count.index].pi_instance_primary_ip
     private_key  = var.ssh_private_key
     agent        = false
     timeout      = "10m"
@@ -109,17 +110,17 @@ resource "terraform_data" "aix_init" {
     content = templatefile("./aix-init/aix_init.sh.tftpl",
       merge(
         { "network_services_config" = local.network_services_config },
-        { "pi_storage_configuration" = module.powervs_instance.pi_storage_configuration }
+        { "pi_storage_configuration" = module.powervs_instance[count.index].pi_storage_configuration }
       )
     )
-    destination = "/root/terraform_files/aix_init.sh"
+    destination = "/root/terraform_files/aix_init-${count.index + 1}.sh"
   }
 
   # Execute aix_ini.sh shell script to configure management services and create filesystem
   provisioner "remote-exec" {
     inline = [
-      "chmod +x /root/terraform_files/aix_init.sh",
-      "/root/terraform_files/aix_init.sh",
+      "chmod +x /root/terraform_files/aix_init-${count.index + 1}.sh",
+      "/root/terraform_files/aix_init-${count.index + 1}.sh",
     ]
   }
 
@@ -130,7 +131,7 @@ module "pi_scc_wp_agent" {
 
   source     = "../../modules/powervs-vpc-landing-zone/submodules/ansible"
   depends_on = [module.standard, module.powervs_instance, terraform_data.aix_init]
-  count      = var.enable_scc_wp && contains(["aix", "linux"], local.pi_instance_os_type) ? 1 : 0
+  count      = var.enable_scc_wp && contains(["aix", "linux"], local.pi_instance_os_type) ? var.powervs_instance_count : 0
 
   bastion_host_ip        = module.standard.access_host_or_ip
   ansible_host_or_ip     = module.standard.ansible_host_or_ip
@@ -139,16 +140,16 @@ module "pi_scc_wp_agent" {
   configure_ansible_host = false
 
   src_script_template_name = "configure-scc-wp-agent/ansible_configure_scc_wp_agent.sh.tftpl"
-  dst_script_file_name     = "${var.prefix}-configure_scc_wp_agent_pi_${local.pi_instance_os_type}.sh"
+  dst_script_file_name     = "${var.prefix}-configure_scc_wp_agent_pi_${local.pi_instance_os_type}-${count.index}.sh"
 
   src_playbook_template_name = "configure-scc-wp-agent/playbook-configure-scc-wp-agent-${local.pi_instance_os_type}.yml.tftpl"
-  dst_playbook_file_name     = "${var.prefix}-playbook-configure-scc-wp-agent-pi-${local.pi_instance_os_type}.yml"
+  dst_playbook_file_name     = "${var.prefix}-playbook-configure-scc-wp-agent-pi-${local.pi_instance_os_type}-${count.index}.yml"
   playbook_template_vars = {
     COLLECTOR_ENDPOINT : module.standard.scc_wp_instance.ingestion_endpoint,
     API_ENDPOINT : module.standard.scc_wp_instance.api_endpoint,
     ACCESS_KEY : module.standard.scc_wp_instance.access_key
   }
   src_inventory_template_name = "inventory.tftpl"
-  dst_inventory_file_name     = "${var.prefix}-scc-wp-inventory-pi-${local.pi_instance_os_type}"
-  inventory_template_vars     = { "host_or_ip" : module.powervs_instance.pi_instance_primary_ip }
+  dst_inventory_file_name     = "${var.prefix}-scc-wp-inventory-pi-${local.pi_instance_os_type}-${count.index}"
+  inventory_template_vars     = { "host_or_ip" : module.powervs_instance[count.index].pi_instance_primary_ip }
 }

solutions/standard-plus-vsi/outputs.tf

@@ -170,17 +170,17 @@ output "powervs_images" {
 
 output "powervs_instance_management_ip" {
   description = "IP address of the primary network interface of IBM PowerVS instance."
-  value       = module.powervs_instance.pi_instance_primary_ip
+  value       = module.powervs_instance[*].pi_instance_primary_ip
 }
 
 output "powervs_instance_private_ips" {
   description = "All private IP addresses (as a list) of IBM PowerVS instance."
-  value       = module.powervs_instance.pi_instance_private_ips
+  value       = module.powervs_instance[*].pi_instance_private_ips
 }
 
 output "powervs_storage_configuration" {
   description = "Storage configuration of PowerVS instance."
-  value       = module.powervs_instance.pi_storage_configuration
+  value       = module.powervs_instance[*].pi_storage_configuration
 }
 
 output "schematics_workspace_id" {

solutions/standard-plus-vsi/variables.tf

@@ -8,6 +8,16 @@ variable "prefix" {
   type        = string
 }
 
+variable "powervs_instance_count" {
+  description = "Number of PowerVS instances to create."
+  type        = number
+  default     = 1
+  validation {
+    condition     = var.powervs_instance_count > 0
+    error_message = "The number of PowerVS instances must be a positive integer."
+  }
+}
+
 variable "tshirt_size" {
   description = "PowerVS instance profiles. These profiles can be overridden by specifying 'custom_profile_instance_boot_image' and 'custom_profile' values in optional parameters."
   type = object({