Skip to content

Commit 1bfd1e6

Browse files
author
Arman Keyoumarsi
committed
Revert "Add disk datastore options"
This reverts commit f7bfa00.
1 parent 317904c commit 1bfd1e6

File tree

4 files changed

+1
-34
lines changed

4 files changed

+1
-34
lines changed

examples/linux/main.tf

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ module "example-server-linuxvm-advanced" {
3636
"VM Network" = ["192.168.0.4", ""] // Here the first instance will use Static Ip and Second set to DHCP
3737
"test" = ["", "192.168.0.3"]
3838
}
39-
disk_datastore = "vsanDatastore"
40-
data_disk_datastore = ["vsanDatastore", "nfsDatastore"]
4139
data_disk_size_gb = [10, 5] // Aditional Disks to be used
4240
thin_provisioned = ["true", "false"]
4341
vmdns = ["192.168.0.2", "192.168.0.1"]

examples/windows/main.tf

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,6 @@ module "example-server-windowsvm-advanced" {
5656
"VM Network" = ["192.168.0.4", ""] // Here the first instance will use Static Ip and Second DHCP
5757
"test" = ["", "192.168.0.3"]
5858
}
59-
disk_datastore = "vsanDatastore"
60-
data_disk_datastore = ["vsanDatastore", "nfsDatastore"]
6159
data_disk_size_gb = [10, 5] // Aditional Disks to be used
6260
thin_provisioned = ["true", "false"]
6361
vmdns = ["192.168.0.2", "192.168.0.1"]

main.tf

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,6 @@ data "vsphere_datastore" "datastore" {
1414
datacenter_id = data.vsphere_datacenter.dc.id
1515
}
1616

17-
data "vsphere_datastore" "disk_datastore" {
18-
count = var.disk_datastore != "" ? 1 : 0
19-
name = var.disk_datastore
20-
datacenter_id = data.vsphere_datacenter.dc.id
21-
}
22-
23-
data "vsphere_datastore" "data_disk_datastore" {
24-
for_each = toset(var.data_disk_datastore)
25-
name = each.key
26-
datacenter_id = data.vsphere_datacenter.dc.id
27-
}
28-
2917
data "vsphere_resource_pool" "pool" {
3018
name = var.vmrp
3119
datacenter_id = data.vsphere_datacenter.dc.id
@@ -107,7 +95,6 @@ resource "vsphere_virtual_machine" "Linux" {
10795
unit_number = template_disks.key
10896
thin_provisioned = data.vsphere_virtual_machine.template.disks[template_disks.key].thin_provisioned
10997
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
11198
}
11299
}
113100

@@ -121,7 +108,6 @@ resource "vsphere_virtual_machine" "Linux" {
121108
unit_number = terraform_disks.key + local.template_disk_count
122109
thin_provisioned = var.thin_provisioned != null ? var.thin_provisioned[terraform_disks.key] : null
123110
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
125111
}
126112
}
127113

@@ -199,7 +185,6 @@ resource "vsphere_virtual_machine" "Windows" {
199185
unit_number = template_disks.key
200186
thin_provisioned = data.vsphere_virtual_machine.template.disks[template_disks.key].thin_provisioned
201187
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
203188
}
204189
}
205190

@@ -213,7 +198,6 @@ resource "vsphere_virtual_machine" "Windows" {
213198
unit_number = terraform_disks.key + local.template_disk_count
214199
thin_provisioned = var.thin_provisioned != null ? var.thin_provisioned[terraform_disks.key] : null
215200
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
217201
}
218202
}
219203

variables.tf

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ variable "datastore" {
6666
default = ""
6767
}
6868

69+
6970
variable "vmfolder" {
7071
description = "The path to the folder to put this virtual machine in, relative to the datacenter that the resource pool is in."
7172
default = null
@@ -155,20 +156,6 @@ variable "data_disk_size_gb" {
155156
default = []
156157
}
157158

158-
variable "disk_datastore"{
159-
type = string
160-
default = null
161-
}
162-
163-
variable "data_disk_datastore" {
164-
type = list
165-
default = []
166-
# validation {
167-
# condition = length(var.disk_datastore) == 0 || length(var.disk_datastore) == length(var.data_disk_size_gb)
168-
# error_message = "The list of disk datastore must be equal in length to disk_size_gb"
169-
# }
170-
}
171-
172159
variable "thin_provisioned" {
173160
description = "If true, this disk is thin provisioned, with space for the file being allocated on an as-needed basis."
174161
type = list

0 commit comments

Comments
 (0)