Skip to content

Commit 9d1732e

Browse files
committed
Fix empty disk_datastore
1 parent f7bfa00 commit 9d1732e

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

main.tf

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ resource "vsphere_virtual_machine" "Linux" {
107107
unit_number = template_disks.key
108108
thin_provisioned = data.vsphere_virtual_machine.template.disks[template_disks.key].thin_provisioned
109109
eagerly_scrub = data.vsphere_virtual_machine.template.disks[template_disks.key].eagerly_scrub
110-
datastore_id = var.disk_datastore != null ? data.vsphere_datastore.disk_datastore[0].id : null
110+
datastore_id = var.disk_datastore != "" ? data.vsphere_datastore.disk_datastore[0].id : null
111111
}
112112
}
113113

@@ -121,7 +121,7 @@ resource "vsphere_virtual_machine" "Linux" {
121121
unit_number = terraform_disks.key + local.template_disk_count
122122
thin_provisioned = var.thin_provisioned != null ? var.thin_provisioned[terraform_disks.key] : null
123123
eagerly_scrub = var.eagerly_scrub != null ? var.eagerly_scrub[terraform_disks.key] : null
124-
datastore_id = var.data_disk_datastore != null ? data.vsphere_datastore.data_disk_datastore[var.data_disk_datastore[terraform_disks.key]].id : null
124+
datastore_id = length(var.data_disk_datastore) > 0 ? data.vsphere_datastore.data_disk_datastore[var.data_disk_datastore[terraform_disks.key]].id : null
125125
}
126126
}
127127

@@ -199,7 +199,7 @@ resource "vsphere_virtual_machine" "Windows" {
199199
unit_number = template_disks.key
200200
thin_provisioned = data.vsphere_virtual_machine.template.disks[template_disks.key].thin_provisioned
201201
eagerly_scrub = data.vsphere_virtual_machine.template.disks[template_disks.key].eagerly_scrub
202-
datastore_id = var.disk_datastore != null ? data.vsphere_datastore.disk_datastore[0].id : null
202+
datastore_id = var.disk_datastore != "" ? data.vsphere_datastore.disk_datastore[0].id : null
203203
}
204204
}
205205

@@ -213,7 +213,7 @@ resource "vsphere_virtual_machine" "Windows" {
213213
unit_number = terraform_disks.key + local.template_disk_count
214214
thin_provisioned = var.thin_provisioned != null ? var.thin_provisioned[terraform_disks.key] : null
215215
eagerly_scrub = var.eagerly_scrub != null ? var.eagerly_scrub[terraform_disks.key] : null
216-
datastore_id = var.data_disk_datastore != null ? data.vsphere_datastore.data_disk_datastore[var.data_disk_datastore[terraform_disks.key]].id : null
216+
datastore_id = length(var.data_disk_datastore) > 0 ? data.vsphere_datastore.data_disk_datastore[var.data_disk_datastore[terraform_disks.key]].id : null
217217
}
218218
}
219219

variables.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,8 @@ variable "data_disk_size_gb" {
156156
}
157157

158158
variable "disk_datastore"{
159-
type = string
160-
default = null
159+
type = string
160+
default = ""
161161
}
162162

163163
variable "data_disk_datastore" {

0 commit comments

Comments
 (0)