Standardize VM size variable names across AWS and GCP Terraform providers (#456)

Update instance type and machine type variable names in AWS and GCP to follow the
`*_vm_size` naming convention. This ensures consistency with the Azure provider
and across the entire project's Terraform codebase.

The following variables have been renamed:
- hana_instancetype / machine_type -> hana_vm_size
- drbd_instancetype / drbd_machine_type -> drbd_vm_size
- netweaver_instancetype / netweaver_machine_type -> netweaver_vm_size
- monitor_instancetype / machine_type_monitor_server -> monitoring_vm_size
- iscsi_instancetype / machine_type_iscsi_server -> iscsi_vm_size

All internal module references, outputs, and documentation examples have been
updated accordingly.

Author: mpagot

terraform/aws/main.tf

@@ -101,7 +101,7 @@ module "drbd_node" {
   name                 = var.drbd_name
   network_domain       = var.drbd_network_domain == "" ? var.network_domain : var.drbd_network_domain
   drbd_count           = var.drbd_enabled == true ? 2 : 0
-  vm_size              = var.drbd_instancetype
+  vm_size              = var.drbd_vm_size
   availability_zones   = data.aws_availability_zones.available.names
   os_image             = local.drbd_os_image
   os_owner             = local.drbd_os_owner
@@ -125,7 +125,7 @@ module "netweaver_node" {
   network_domain       = var.netweaver_network_domain == "" ? var.network_domain : var.netweaver_network_domain
   xscs_server_count    = local.netweaver_xscs_server_count
   app_server_count     = var.netweaver_enabled ? var.netweaver_app_server_count : 0
-  vm_size              = var.netweaver_instancetype
+  vm_size              = var.netweaver_vm_size
   availability_zones   = data.aws_availability_zones.available.names
   os_image             = local.netweaver_os_image
   os_owner             = local.netweaver_os_owner
@@ -147,7 +147,7 @@ module "hana_node" {
   name                 = var.hana_name
   network_domain       = var.hana_network_domain == "" ? var.network_domain : var.hana_network_domain
   hana_count           = var.hana_count
-  vm_size              = var.hana_instancetype
+  vm_size              = var.hana_vm_size
   availability_zones   = data.aws_availability_zones.available.names
   os_image             = local.hana_os_image
   os_owner             = local.hana_os_owner
@@ -169,7 +169,7 @@ module "monitoring" {
   name               = var.monitoring_name
   network_domain     = var.monitoring_network_domain == "" ? var.network_domain : var.monitoring_network_domain
   monitoring_enabled = var.monitoring_enabled
-  vm_size            = var.monitor_instancetype
+  vm_size            = var.monitoring_vm_size
   key_name           = aws_key_pair.key-pair.key_name
   security_group_id  = local.security_group_id
   monitoring_srv_ip  = local.monitoring_ip
@@ -190,7 +190,7 @@ module "iscsi_server" {
   subnet_ids         = aws_subnet.infra-subnet.*.id
   os_image           = local.iscsi_os_image
   os_owner           = local.iscsi_os_owner
-  vm_size            = var.iscsi_instancetype
+  vm_size            = var.iscsi_vm_size
   key_name           = aws_key_pair.key-pair.key_name
   security_group_id  = local.security_group_id
   host_ips           = local.iscsi_ips

terraform/aws/outputs.tf

@@ -106,12 +106,12 @@ resource "local_file" "ansible_inventory" {
       hana_name           = var.hana_name,
       hana_pip            = module.hana_node.hana_public_ip,
       hana_remote_python  = var.hana_remote_python,
-      hana_machinetype    = var.hana_instancetype,
+      hana_machinetype    = var.hana_vm_size,
       iscsi_name          = var.iscsi_name,
       iscsi_pip           = module.iscsi_server.iscsisrv_public_ip,
       iscsi_enabled       = local.iscsi_enabled,
       iscsi_remote_python = var.iscsi_remote_python,
-      iscsi_machinetype   = var.iscsi_instancetype,
+      iscsi_machinetype   = var.iscsi_vm_size,
       use_sbd             = local.use_sbd,
       routetable_id       = aws_route_table.route-table.id,
       cluster_ip          = local.hana_cluster_vip,

terraform/aws/terraform.tfvars.example

@@ -75,7 +75,7 @@ hana_name = "vmhana"
 # Instance type to use for the hana cluster nodes
 # SAP certified instances types can be found at https://aws.amazon.com/sap/instance-types/
 # and example sizing at https://aws.amazon.com/sap/solutions/s4hana/ .
-#hana_instancetype = "r6i.xlarge"
+#hana_vm_size = "r6i.xlarge"
 
 # Disk type for HANA
 #hana_data_disk_type = "gp2"
@@ -183,7 +183,7 @@ hana_count = "2"
 # Hostname, without the domain part
 #drbd_name = "vmdrbd"
 
-#drbd_instancetype = "t3.medium"
+#drbd_vm_size = "t3.medium"
 
 # DRBD machines image. By default, PAYG image is used. The usage is the same as the HANA images
 #drbd_os_image = "suse-sles-sap-15-sp3-byos"
@@ -222,7 +222,7 @@ hana_count = "2"
 # Instance type to use for the Netweaver nodes
 # SAP certified instances types can be found at https://aws.amazon.com/sap/instance-types/
 # and example sizing at https://aws.amazon.com/sap/solutions/s4hana/ .
-#netweaver_instancetype = "r5.large"
+#netweaver_vm_size = "r5.large"
 
 # Netweaver machines image. By default, PAYG image is used. The usage is the same as the HANA images
 #netweaver_os_image = "suse-sles-sap-15-sp3-byos"

terraform/aws/variables.tf

@@ -136,7 +136,7 @@ variable "hana_os_owner" {
   default     = ""
 }
 
-variable "hana_instancetype" {
+variable "hana_vm_size" {
   description = "The instance type of the hana nodes"
   type        = string
   default     = "r6i.xlarge"
@@ -325,7 +325,7 @@ variable "drbd_os_owner" {
   default     = ""
 }
 
-variable "drbd_instancetype" {
+variable "drbd_vm_size" {
   description = "The instance type of the drbd node"
   type        = string
   default     = "t3.medium"
@@ -449,7 +449,7 @@ variable "iscsi_os_owner" {
   default     = ""
 }
 
-variable "iscsi_instancetype" {
+variable "iscsi_vm_size" {
   description = "The instance type of the iscsi server node."
   type        = string
   default     = "t3.small"
@@ -505,7 +505,7 @@ variable "monitoring_os_owner" {
   default     = ""
 }
 
-variable "monitor_instancetype" {
+variable "monitoring_vm_size" {
   description = "The instance type of the monitoring node."
   type        = string
   default     = "t3.micro"
@@ -567,7 +567,7 @@ variable "netweaver_os_owner" {
   default     = ""
 }
 
-variable "netweaver_instancetype" {
+variable "netweaver_vm_size" {
   description = "Instance type for the Netweaver machines"
   type        = string
   default     = "r5.large"

terraform/gcp/main.tf

@@ -145,7 +145,7 @@ module "drbd_node" {
   name                = var.drbd_name
   network_domain      = var.drbd_network_domain == "" ? var.network_domain : var.drbd_network_domain
   drbd_count          = var.drbd_enabled == true ? 2 : 0
-  vm_size             = var.drbd_machine_type
+  vm_size             = var.drbd_vm_size
   compute_zones       = local.compute_zones
   network_name        = local.vpc_name
   network_subnet_name = local.subnet_name
@@ -165,7 +165,7 @@ module "netweaver_node" {
   network_domain            = var.netweaver_network_domain == "" ? var.network_domain : var.netweaver_network_domain
   xscs_server_count         = local.netweaver_xscs_server_count
   app_server_count          = var.netweaver_enabled ? var.netweaver_app_server_count : 0
-  vm_size                   = var.netweaver_machine_type
+  vm_size                   = var.netweaver_vm_size
   compute_zones             = local.compute_zones
   network_name              = local.vpc_name
   network_subnet_name       = local.subnet_name
@@ -182,7 +182,7 @@ module "hana_node" {
   name                  = var.hana_name
   network_domain        = var.hana_network_domain == "" ? var.network_domain : var.hana_network_domain
   hana_count            = var.hana_count
-  vm_size               = var.machine_type
+  vm_size               = var.hana_vm_size
   compute_zones         = local.compute_zones
   network_name          = local.vpc_name
   network_subnet_name   = local.subnet_name
@@ -203,7 +203,7 @@ module "monitoring" {
   name                = var.monitoring_name
   network_domain      = var.monitoring_network_domain == "" ? var.network_domain : var.monitoring_network_domain
   monitoring_enabled  = var.monitoring_enabled
-  vm_size             = var.machine_type_monitor_server
+  vm_size             = var.monitoring_vm_size
   compute_zones       = local.compute_zones
   network_subnet_name = local.subnet_name
   os_image            = local.monitoring_os_image
@@ -216,7 +216,7 @@ module "iscsi_server" {
   name                = var.iscsi_name
   network_domain      = var.iscsi_network_domain == "" ? var.network_domain : var.iscsi_network_domain
   iscsi_count         = local.iscsi_enabled == true ? var.iscsi_count : 0
-  vm_size             = var.machine_type_iscsi_server
+  vm_size             = var.iscsi_vm_size
   compute_zones       = local.compute_zones
   network_subnet_name = local.subnet_name
   os_image            = local.iscsi_os_image

terraform/gcp/terraform.tfvars.example

@@ -82,7 +82,7 @@ hana_name = "vmhana"
 
 # HANA machine type
 # VM size to use for the cluster nodes
-machine_type = "n1-highmem-32"
+hana_vm_size = "n1-highmem-32"
 
 # Custom sles4sap image
 # HANA machines image. By default, PAYG image is used (it will select the latest version that matches this name)
@@ -176,7 +176,7 @@ machine_type = "n1-highmem-32"
 #iscsi_disk_size = 10
 
 # Type of VM (vCPUs and RAM)
-#machine_type_iscsi_server = "custom-1-2048"
+#iscsi_vm_size = "custom-1-2048"
 
 ##############################
 # Monitoring related variables
@@ -204,7 +204,7 @@ machine_type = "n1-highmem-32"
 # Hostname, without the domain part
 #drbd_name = "vmdrbd"
 
-#drbd_machine_type = "n1-standard-4"
+#drbd_vm_size = "n1-standard-4"
 
 # DRBD machines image. By default, PAYG image is used. The usage is the same as the HANA images
 #drbd_os_image = "suse-byos-cloud/sles-15-sp3-sap-byos"
@@ -248,7 +248,7 @@ machine_type = "n1-highmem-32"
 # Set to 2 or higher to deploy additional AAS instances in new machines
 #netweaver_app_server_count = 2
 
-#netweaver_machine_type = "n1-standard-8"
+#netweaver_vm_size = "n1-standard-8"
 
 # Netweaver machines image. By default, PAYG image is used. The usage is the same as the HANA images
 #netweaver_os_image = "suse-byos-cloud/sles-15-sp3-sap-byos"

terraform/gcp/variables.tf

@@ -128,7 +128,7 @@ variable "hana_os_image" {
   default     = ""
 }
 
-variable "machine_type" {
+variable "hana_vm_size" {
   description = "The instance type of the hana nodes"
   type        = string
   default     = "n1-highmem-32"
@@ -322,7 +322,7 @@ variable "monitoring_name" {
   default     = "vmmonitoring"
 }
 
-variable "machine_type_monitor_server" {
+variable "monitoring_vm_size" {
   description = "VM size for the monitor server machine"
   type        = string
   default     = "custom-1-2048"
@@ -407,7 +407,7 @@ variable "iscsi_os_image" {
   default     = ""
 }
 
-variable "machine_type_iscsi_server" {
+variable "iscsi_vm_size" {
   description = "VM size for the iscsi server machine"
   type        = string
   default     = "custom-1-2048"
@@ -456,7 +456,7 @@ variable "drbd_enabled" {
   default     = false
 }
 
-variable "drbd_machine_type" {
+variable "drbd_vm_size" {
   description = "VM size for the DRBD machine"
   type        = string
   default     = "n1-standard-4"
@@ -566,7 +566,7 @@ variable "netweaver_os_image" {
   default     = ""
 }
 
-variable "netweaver_machine_type" {
+variable "netweaver_vm_size" {
   description = "The instance type of the netweaver nodes"
   type        = string
   default     = "n1-highmem-8"