Merge pull request #24 from SamyCoenen/feature/disk-label

Add template disk labels and data disk labels

Author: Arman-Keyoumarsi

examples/linux/README.md

@@ -57,6 +57,13 @@ module "example-server-linuxvm-withdatadisk" {
     "test"       = ["", "192.168.0.3"]
   }
   data_disk_size_gb = [10, 5] // Aditional Disk to be used
+  disk_label                 = ["tpl-disk-1"]
+  data_disk_label            = ["label1", "label2"]
+  scsi_type = "lsilogic" # "pvscsi"
+  scsi_controller = 0 # template disk scsi_controller
+  data_disk_scsi_controller  = [0, 1]
+  disk_datastore             = "vsanDatastore"
+  data_disk_datastore        = ["vsanDatastore", "nfsDatastore"]
   thin_provisioned  = ["true", "false"]
   vmdns             = ["192.168.0.2", "192.168.0.1"]
   vmgateway         = "192.168.0.1"

examples/linux/main.tf

@@ -36,6 +36,8 @@ module "example-server-linuxvm-advanced" {
     "VM Network" = ["192.168.0.4", ""] // Here the first instance will use Static Ip and Second set to DHCP
     "test"       = ["", "192.168.0.3"]
   }
+  disk_label                 = ["tpl-disk-1"]
+  data_disk_label            = ["label1", "label2"]
   scsi_type = "lsilogic" # "pvscsi"
   scsi_controller = 0
   data_disk_scsi_controller  = [0, 1]

examples/windows/README.md

@@ -53,6 +53,13 @@ module "example-server-windowsvm-advanced" {
     "test"       = ["", "192.168.0.3"]
   }
   data_disk_size_gb = [10, 5] // Aditional Disks to be used
+  disk_label                 = ["tpl-disk-1"]
+  data_disk_label            = ["label1", "label2"]
+  scsi_type = "lsilogic" # "pvscsi"
+  scsi_controller = 0 # template disk scsi_controller
+  data_disk_scsi_controller  = [0, 1]
+  disk_datastore             = "vsanDatastore"
+  data_disk_datastore        = ["vsanDatastore", "nfsDatastore"]
   thin_provisioned  = ["true", "false"]
   vmdns             = ["192.168.0.2", "192.168.0.1"]
   vmgateway         = "192.168.0.1"

examples/windows/main.tf

@@ -56,6 +56,8 @@ module "example-server-windowsvm-advanced" {
     "VM Network" = ["192.168.0.4", ""] // Here the first instance will use Static Ip and Second DHCP
     "test"       = ["", "192.168.0.3"]
   }
+  disk_label                 = ["tpl-disk-1"]
+  data_disk_label            = ["label1", "label2"]
   scsi_type = "lsilogic" # "pvscsi"
   scsi_controller = 0
   data_disk_scsi_controller  = [0, 3]

main.tf

@@ -103,7 +103,7 @@ resource "vsphere_virtual_machine" "Linux" {
     for_each = data.vsphere_virtual_machine.template.disks
     iterator = template_disks
     content {
-      label            = "disk${template_disks.key}"
+      label            = length(var.disk_label) > 0 ? var.disk_label[template_disks.key] : "disk${template_disks.key}"
       size             = data.vsphere_virtual_machine.template.disks[template_disks.key].size
       unit_number      = var.scsi_controller != null ? var.scsi_controller * 15 + template_disks.key : template_disks.key
       thin_provisioned = data.vsphere_virtual_machine.template.disks[template_disks.key].thin_provisioned
@@ -117,7 +117,7 @@ resource "vsphere_virtual_machine" "Linux" {
     for_each = var.data_disk_size_gb
     iterator = terraform_disks
     content {
-      label            = "disk${terraform_disks.key + local.template_disk_count}"
+      label            = length(var.data_disk_label) > 0 ? var.data_disk_label[terraform_disks.key] : "disk${terraform_disks.key + local.template_disk_count}"
       size             = var.data_disk_size_gb[terraform_disks.key]
       unit_number      = length(var.data_disk_scsi_controller) > 0 ? var.data_disk_scsi_controller[terraform_disks.key] * 15 + terraform_disks.key + (var.scsi_controller == var.data_disk_scsi_controller[terraform_disks.key] ? local.template_disk_count : 0) : terraform_disks.key + local.template_disk_count
       thin_provisioned = var.thin_provisioned != null ? var.thin_provisioned[terraform_disks.key] : null
@@ -196,7 +196,7 @@ resource "vsphere_virtual_machine" "Windows" {
     for_each = data.vsphere_virtual_machine.template.disks
     iterator = template_disks
     content {
-      label            = "disk${template_disks.key}"
+      label            = length(var.disk_label) > 0 ? var.disk_label[template_disks.key] : "disk${template_disks.key}"
       size             = data.vsphere_virtual_machine.template.disks[template_disks.key].size
       unit_number      = var.scsi_controller != null ? var.scsi_controller * 15 + template_disks.key : template_disks.key
       thin_provisioned = data.vsphere_virtual_machine.template.disks[template_disks.key].thin_provisioned
@@ -210,7 +210,7 @@ resource "vsphere_virtual_machine" "Windows" {
     for_each = var.data_disk_size_gb
     iterator = terraform_disks
     content {
-      label            = "disk${terraform_disks.key + local.template_disk_count}"
+      label            = length(var.data_disk_label) > 0 ? var.data_disk_label[terraform_disks.key] : "disk${terraform_disks.key + local.template_disk_count}"
       size             = var.data_disk_size_gb[terraform_disks.key]
       unit_number      = length(var.data_disk_scsi_controller) > 0 ? var.data_disk_scsi_controller[terraform_disks.key] * 15 + terraform_disks.key + (var.scsi_controller == var.data_disk_scsi_controller[terraform_disks.key] ? local.template_disk_count : 0) : terraform_disks.key + local.template_disk_count
       thin_provisioned = var.thin_provisioned != null ? var.thin_provisioned[terraform_disks.key] : null

variables.tf

@@ -150,6 +150,18 @@ variable "memory_hot_add_enabled" {
   default     = null
 }
 
+variable "disk_label" {
+  description = "Storage data disk labels"
+  type        = list
+  default     = []
+}
+
+variable "data_disk_label" {
+  description = "Storage data disk labels"
+  type        = list
+  default     = []
+}
+
 variable "data_disk_size_gb" {
   description = "List of Storage data disk size"
   type        = list