Merge branch 'Terraform-VMWare-Modules:master' into master

Author: riccardo-salamanna

README.md

@@ -125,11 +125,11 @@ module "example-server-windowsvm-advanced" {
 }
 
 output "vmnames" {
-  value = "${module.example-server-windowsvm-advanced.Windows-VM}"
+  value = module.example-server-windowsvm-advanced.VM
 }
 
 output "vmnameswip" {
-  value = "${module.example-server-windowsvm-advanced.Windows-ip}"
+  value = module.example-server-windowsvm-advanced.ip
 }
 ```
 

main.tf

@@ -89,12 +89,18 @@ resource "vsphere_virtual_machine" "vm" {
   guest_id               = data.vsphere_virtual_machine.template.guest_id
   scsi_bus_sharing       = var.scsi_bus_sharing
   scsi_type              = var.scsi_type != "" ? var.scsi_type : data.vsphere_virtual_machine.template.scsi_type
-  scsi_controller_count = max(max(0, flatten([
-    for item in values(var.data_disk) : [
-      for elem, val in item :
-      elem == "data_disk_scsi_controller" ? val : 0
-    ]
-  ])...) + 1, var.scsi_controller)
+  scsi_controller_count = max(
+    max(0,flatten([
+      for item in values(var.data_disk) : [
+        for elem, val in item :
+        elem == "data_disk_scsi_controller" ? val : 0
+      ]])...) + 1,
+    ceil((max(0,flatten([
+      for item in values(var.data_disk) : [
+        for elem, val in item :
+        elem == "unit_number" ? val : 0
+      ]  ])...) + 1) / 15),
+    var.scsi_controller)
   wait_for_guest_net_routable = var.wait_for_guest_net_routable
   wait_for_guest_ip_timeout   = var.wait_for_guest_ip_timeout
   wait_for_guest_net_timeout  = var.wait_for_guest_net_timeout
@@ -132,7 +138,27 @@ resource "vsphere_virtual_machine" "vm" {
     content {
       label             = terraform_disks.key
       size              = lookup(terraform_disks.value, "size_gb", null)
-      unit_number       = lookup(terraform_disks.value, "data_disk_scsi_controller", 0) ? terraform_disks.value.data_disk_scsi_controller * 15 + index(keys(var.data_disk), terraform_disks.key) + (var.scsi_controller == tonumber(terraform_disks.value["data_disk_scsi_controller"]) ? local.template_disk_count : 0) : index(keys(var.data_disk), terraform_disks.key) + local.template_disk_count
+      unit_number = (
+        lookup(
+          terraform_disks.value, 
+          "unit_number", 
+          -1
+        ) < 0 ? (
+          lookup(
+            terraform_disks.value, 
+            "data_disk_scsi_controller", 
+            0
+          ) > 0 ? (
+            (terraform_disks.value.data_disk_scsi_controller * 15) +
+            index(keys(var.data_disk), terraform_disks.key) + 
+            (var.scsi_controller == tonumber(terraform_disks.value["data_disk_scsi_controller"]) ? local.template_disk_count : 0)
+          ) : (
+            index(keys(var.data_disk), terraform_disks.key) + local.template_disk_count
+          )
+        ) : (
+          tonumber(terraform_disks.value["unit_number"])
+        )
+      )
       thin_provisioned  = lookup(terraform_disks.value, "thin_provisioned", "true")
       eagerly_scrub     = lookup(terraform_disks.value, "eagerly_scrub", "false")
       datastore_id      = lookup(terraform_disks.value, "datastore_id", null)

tests/sanity/.terraform.lock.hcl

@@ -39,11 +39,19 @@ vm = {
         data_disk_scsi_controller = 1,
         datastore_id              = "datastore-90679"
       }
+      disk4 = {
+        size_gb                   = 5,
+        thin_provisioned          = true,
+        unit_number               = 30,
+        datastore_id              = "datastore-90679"
+      }
     }
     network = {
       "VM Port Group" = ["10.13.13.2", ""], # To use DHCP create Empty list for each instance
       "VM Port Group" = ["", ""]
     }
+    tags = {}
+    annotation = null
   },
   windowsvm = {
     vmname           = "example-server-windows",
@@ -62,6 +70,8 @@ vm = {
       "VM Port Group" = ["", ""]
     }
   }
+    tags = {}
+    annotation = null
 }
 ```
 

tests/sanity/README.md

@@ -0,0 +1,4 @@
+terraform init
+terraform fmt
+terraform validate
+terraform apply -var-file="private.tfvars"

tests/sanity/apply.sh

@@ -0,0 +1,3 @@
+terraform destroy -var-file=private.tfvars
+rm terraform.tfstate terraform.tfstate.backup .terraform.lock.hcl
+rm -rf .terraform

tests/sanity/cleanup.sh

@@ -19,14 +19,6 @@ variable "env" {
   default = "dev"
 }
 
-data "vsphere_storage_policy" "this" {
-  name = "Test"
-}
-
-output "disk_id" {
-  value = data.vsphere_storage_policy.this.id
-}
-
 variable "vm" {
   type = map(object({
     vmname           = string
@@ -46,22 +38,32 @@ variable "vm" {
 }
 
 module "example-server-basic" {
-  source                     = "../../"
-  for_each                   = var.vm
-  vmnameformat               = "%03d${var.env}"
-  template_storage_policy_id = [data.vsphere_storage_policy.this.id]
-  tag_depends_on             = [vsphere_tag.tag.id]
-  tags                       = each.value.tags
-  vmtemp                     = each.value.vmtemp
-  is_windows_image           = each.value.is_windows_image
-  instances                  = each.value.instances
-  vmname                     = each.value.vmname
-  vmrp                       = each.value.vmrp
-  vmfolder                   = each.value.vmfolder
-  network                    = each.value.network
-  vmgateway                  = each.value.vmgateway
-  dc                         = each.value.dc
-  datastore                  = each.value.datastore
-  data_disk                  = each.value.data_disk
+  source           = "../../"
+  for_each         = var.vm
+  vmnameformat     = "%03d${var.env}"
+  tag_depends_on   = [vsphere_tag.tag.id]
+  tags             = each.value.tags
+  vmtemp           = each.value.vmtemp
+  is_windows_image = each.value.is_windows_image
+  instances        = each.value.instances
+  vmname           = each.value.vmname
+  vmrp             = each.value.vmrp
+  vmfolder         = each.value.vmfolder
+  network          = each.value.network
+  vmgateway        = each.value.vmgateway
+  dc               = each.value.dc
+  datastore        = each.value.datastore
+  data_disk        = each.value.data_disk
 }
 
+output "DC_ID" {
+  value = tomap({
+    for k, i in module.example-server-basic : k => i.DC_ID
+  })
+}
+
+output "VM" {
+  value = tomap({
+    for k, i in module.example-server-basic : k => i.VM
+  })
+}