Skip to content

Commit 3cb1ecc

Browse files
Merge branch 'master' into feature/disk-label
2 parents 694ac85 + 52ef2f0 commit 3cb1ecc

File tree

6 files changed

+11
-2
lines changed

6 files changed

+11
-2
lines changed

examples/linux/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ module "example-server-linuxvm-withdatadisk" {
6767
thin_provisioned = ["true", "false"]
6868
vmdns = ["192.168.0.2", "192.168.0.1"]
6969
vmgateway = "192.168.0.1"
70+
network_type = ["vmxnet3", "vmxnet3"]
7071
tags = {
7172
"terraform-test-category" = "terraform-test-tag"
7273
"terraform-test-category-02" = "terraform-test-tag-02"

examples/linux/main.tf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ module "example-server-linuxvm-advanced" {
4747
thin_provisioned = ["true", "false"]
4848
vmdns = ["192.168.0.2", "192.168.0.1"]
4949
vmgateway = "192.168.0.1"
50+
network_type = ["vmxnet3", "vmxnet3"]
5051
tags = {
5152
"terraform-test-category" = "terraform-test-tag"
5253
"terraform-test-category-02" = "terraform-test-tag-02"

examples/windows/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ module "example-server-windowsvm-advanced" {
6363
thin_provisioned = ["true", "false"]
6464
vmdns = ["192.168.0.2", "192.168.0.1"]
6565
vmgateway = "192.168.0.1"
66+
network_type = ["vmxnet3", "vmxnet3"]
6667
tags = {
6768
"terraform-test-category" = "terraform-test-tag"
6869
"terraform-test-category-02" = "terraform-test-tag-02"

examples/windows/main.tf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ module "example-server-windowsvm-advanced" {
6767
thin_provisioned = ["true", "false"]
6868
vmdns = ["192.168.0.2", "192.168.0.1"]
6969
vmgateway = "192.168.0.1"
70+
network_type = ["vmxnet3", "vmxnet3"]
7071
tags = {
7172
"terraform-test-category" = "terraform-test-tag"
7273
"terraform-test-category-02" = "terraform-test-tag-02"

main.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ resource "vsphere_virtual_machine" "Linux" {
9494
for_each = var.network_cards
9595
content {
9696
network_id = data.vsphere_network.network[network_interface.key].id
97-
adapter_type = data.vsphere_virtual_machine.template.network_interface_types[0]
97+
adapter_type = var.network_type != null ? var.network_type[network_interface.key] : data.vsphere_virtual_machine.template.network_interface_types[0]
9898
}
9999
}
100100

@@ -187,7 +187,7 @@ resource "vsphere_virtual_machine" "Windows" {
187187
for_each = var.network_cards
188188
content {
189189
network_id = data.vsphere_network.network[network_interface.key].id
190-
adapter_type = data.vsphere_virtual_machine.template.network_interface_types[0]
190+
adapter_type = var.network_type != null ? var.network_type[network_interface.key] : data.vsphere_virtual_machine.template.network_interface_types[0]
191191
}
192192
}
193193

variables.tf

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,11 @@ variable "enable_disk_uuid" {
226226
default = null
227227
}
228228

229+
variable "network_type" {
230+
type = list
231+
default = null
232+
}
233+
229234
#Linux Customization Variables
230235
variable "hw_clock_utc" {
231236
description = "Tells the operating system that the hardware clock is set to UTC"

0 commit comments

Comments
 (0)