Rewrite configs to point to new TinyCore based template

hashicorp · Mar 21, 2022 · d45ffeb · d45ffeb
1 parent 3bc2ce9
commit d45ffeb
Show file tree

Hide file tree

Showing 14 changed files with 84 additions and 86 deletions.
diff --git a/scripts/packet/devrc.tpl b/scripts/packet/devrc.tpl
@@ -39,7 +39,6 @@ export TF_VAR_VSPHERE_NFS_PATH1=/nfs/ds1
 export TF_VAR_VSPHERE_NFS_PATH2=/nfs/ds2
 export TF_VAR_VSPHERE_ISO_DATASTORE=nfs
 export TF_VAR_VSPHERE_ISO_FILE=fake.iso
-export TF_VAR_REMOTE_OVA_URL="https://storage.googleapis.com/acctest-images/tfvsphere_template.ova"
 export TF_VAR_VSPHERE_TEMPLATE=tfvsphere_template
 export TF_VAR_VSPHERE_INIT_TYPE=thin
 export TF_VAR_VSPHERE_ADAPTER_TYPE=lsiLogic
@@ -48,10 +47,9 @@ export TF_VAR_VSPHERE_DS_FOLDER=ds
 export TF_VAR_VSPHERE_USE_LINKED_CLONE=true
 export TF_VAR_VSPHERE_PERSIST_SESSION=true
 export TF_VAR_VSPHERE_CLONED_VM_DISK_SIZE=20
-export TF_VAR_VSPHERE_TEST_OVA="https://storage.googleapis.com/acctest-images/yVM.ova"
-export TF_VAR_VSPHERE_TEST_OVF="https://storage.googleapis.com/acctest-images/yVM.ovf"
-export TF_VAR_VSPHERE_CONTENT_LIBRARY_FILES="https://storage.googleapis.com/acctest-images/yVM.ovf"
-export TF_VAR_REMOTE_OVF_URL=https://acctest-images.storage.googleapis.com/tfvsphere_template.ovf
+export TF_VAR_VSPHERE_TEST_OVA="https://storage.googleapis.com/vsphere-acctest/tiny/tiny.ova"
+export TF_VAR_VSPHERE_TEST_OVF="https://storage.googleapis.com/vsphere-acctest/tiny/tiny.ovf"
+export TF_VAR_VSPHERE_CONTENT_LIBRARY_FILES="https://storage.googleapis.com/vsphere-acctest/tiny/tiny.ovf"
 
 export TF_VAR_VSPHERE_HOST_NIC0=vmnic0
 export TF_VAR_VSPHERE_HOST_NIC1=vmnic1

diff --git a/scripts/packet/main.tf.phase3 b/scripts/packet/main.tf.phase3
@@ -264,14 +264,14 @@ resource "vsphere_virtual_machine" "template" {
 
   num_cpus = 2
   memory   = 2048
-  guest_id = "other3xLinux64Guest"
+  guest_id = "other3xLinuxGuest"
 
   network_interface {
     network_id = vsphere_distributed_port_group.pg.id
   }
 
   ovf_deploy {
-    remote_ovf_url = "https://acctest-images.storage.googleapis.com/tfvsphere_template.ovf"
+    remote_ovf_url = "https://storage.googleapis.com/vsphere-acctest/tiny/tiny.ovf"
     ovf_network_map = {
       "terraform-test-pg" = vsphere_distributed_port_group.pg.id
     }
@@ -295,7 +295,7 @@ resource "vsphere_virtual_machine" "pxe" {
 
   num_cpus = 2
   memory   = 2048
-  guest_id = "other3xLinux64Guest"
+  guest_id = "other3xLinuxGuest"
 
   network_interface {
     network_id = data.vsphere_network.vmnet.id

diff --git a/vsphere/resource_vsphere_compute_cluster_vm_affinity_rule_test.go b/vsphere/resource_vsphere_compute_cluster_vm_affinity_rule_test.go
@@ -321,7 +321,7 @@ resource "vsphere_virtual_machine" "vm" {
 
   num_cpus = 2
   memory   = 2048
-  guest_id = "other3xLinux64Guest"
+  guest_id = "other3xLinuxGuest"
 
   wait_for_guest_net_timeout = -1
 

diff --git a/vsphere/resource_vsphere_compute_cluster_vm_anti_affinity_rule_test.go b/vsphere/resource_vsphere_compute_cluster_vm_anti_affinity_rule_test.go
@@ -321,7 +321,7 @@ resource "vsphere_virtual_machine" "vm" {
 
   num_cpus = 2
   memory   = 2048
-  guest_id = "other3xLinux64Guest"
+  guest_id = "other3xLinuxGuest"
 
   wait_for_guest_net_timeout = -1
 

diff --git a/vsphere/resource_vsphere_compute_cluster_vm_dependency_rule_test.go b/vsphere/resource_vsphere_compute_cluster_vm_dependency_rule_test.go
@@ -293,7 +293,7 @@ resource "vsphere_virtual_machine" "vm" {
 
   num_cpus = 2
   memory   = 2048
-  guest_id = "other3xLinux64Guest"
+  guest_id = "other3xLinuxGuest"
 
   wait_for_guest_net_timeout = -1
 
@@ -314,7 +314,7 @@ resource "vsphere_virtual_machine" "dependent_vm" {
 
   num_cpus = 2
   memory   = 2048
-  guest_id = "other3xLinux64Guest"
+  guest_id = "other3xLinuxGuest"
 
   wait_for_guest_net_timeout = -1
 
@@ -371,7 +371,7 @@ resource "vsphere_virtual_machine" "vm" {
 
   num_cpus = 2
   memory   = 2048
-  guest_id = "other3xLinux64Guest"
+  guest_id = "other3xLinuxGuest"
 
   wait_for_guest_net_timeout = -1
 
@@ -392,7 +392,7 @@ resource "vsphere_virtual_machine" "dependent_vm" {
 
   num_cpus = 2
   memory   = 2048
-  guest_id = "other3xLinux64Guest"
+  guest_id = "other3xLinuxGuest"
 
   wait_for_guest_net_timeout = -1
 
@@ -413,7 +413,7 @@ resource "vsphere_virtual_machine" "second_dependent_vm" {
 
   num_cpus = 2
   memory   = 2048
-  guest_id = "other3xLinux64Guest"
+  guest_id = "other3xLinuxGuest"
 
   wait_for_guest_net_timeout = -1
 
@@ -467,7 +467,7 @@ resource "vsphere_virtual_machine" "vm" {
 
   num_cpus = 2
   memory   = 2048
-  guest_id = "other3xLinux64Guest"
+  guest_id = "other3xLinuxGuest"
 
   wait_for_guest_net_timeout = -1
 
@@ -488,7 +488,7 @@ resource "vsphere_virtual_machine" "dependent_vm" {
 
   num_cpus = 2
   memory   = 2048
-  guest_id = "other3xLinux64Guest"
+  guest_id = "other3xLinuxGuest"
 
   wait_for_guest_net_timeout = -1
 

diff --git a/vsphere/resource_vsphere_compute_cluster_vm_group_test.go b/vsphere/resource_vsphere_compute_cluster_vm_group_test.go
@@ -234,7 +234,7 @@ resource "vsphere_virtual_machine" "vm" {
 
   num_cpus = 2
   memory   = 2048
-  guest_id = "other3xLinux64Guest"
+  guest_id = "other3xLinuxGuest"
 
   wait_for_guest_net_timeout = -1
 

diff --git a/vsphere/resource_vsphere_compute_cluster_vm_host_rule_test.go b/vsphere/resource_vsphere_compute_cluster_vm_host_rule_test.go
@@ -302,7 +302,7 @@ resource "vsphere_virtual_machine" "vm" {
 
   num_cpus = 2
   memory   = 2048
-  guest_id = "other3xLinux64Guest"
+  guest_id = "other3xLinuxGuest"
 
   wait_for_guest_net_timeout = -1
 
@@ -357,7 +357,7 @@ resource "vsphere_virtual_machine" "vm" {
 
   num_cpus = 2
   memory   = 2048
-  guest_id = "other3xLinux64Guest"
+  guest_id = "other3xLinuxGuest"
 
   wait_for_guest_net_timeout = -1
 
@@ -412,7 +412,7 @@ resource "vsphere_virtual_machine" "vm" {
 
   num_cpus = 2
   memory   = 2048
-  guest_id = "other3xLinux64Guest"
+  guest_id = "other3xLinuxGuest"
 
   wait_for_guest_net_timeout = -1
 

diff --git a/vsphere/resource_vsphere_datastore_cluster_vm_anti_affinity_rule_test.go b/vsphere/resource_vsphere_datastore_cluster_vm_anti_affinity_rule_test.go
@@ -348,7 +348,7 @@ resource "vsphere_virtual_machine" "vm" {
 
   num_cpus = 2
   memory   = 2048
-  guest_id = "other3xLinux64Guest"
+  guest_id = "other3xLinuxGuest"
 
   wait_for_guest_net_timeout = -1
 

diff --git a/vsphere/resource_vsphere_drs_vm_override_test.go b/vsphere/resource_vsphere_drs_vm_override_test.go
@@ -204,7 +204,7 @@ resource "vsphere_virtual_machine" "vm" {
 
   num_cpus = 2
   memory   = 2048
-  guest_id = "other3xLinux64Guest"
+  guest_id = "other3xLinuxGuest"
 
 	wait_for_guest_net_timeout = -1
 
@@ -245,7 +245,7 @@ resource "vsphere_virtual_machine" "vm" {
 
   num_cpus = 2
   memory   = 2048
-  guest_id = "other3xLinux64Guest"
+  guest_id = "other3xLinuxGuest"
 
 	wait_for_guest_net_timeout = -1
 

diff --git a/vsphere/resource_vsphere_ha_vm_override_test.go b/vsphere/resource_vsphere_ha_vm_override_test.go
@@ -396,7 +396,7 @@ resource "vsphere_virtual_machine" "vm" {
 
   num_cpus = 2
   memory   = 2048
-  guest_id = "other3xLinux64Guest"
+  guest_id = "other3xLinuxGuest"
 
 	wait_for_guest_net_timeout = -1
 
@@ -437,7 +437,7 @@ resource "vsphere_virtual_machine" "vm" {
 
   num_cpus = 2
   memory   = 2048
-  guest_id = "other3xLinux64Guest"
+  guest_id = "other3xLinuxGuest"
 
 	wait_for_guest_net_timeout = -1
 

diff --git a/vsphere/resource_vsphere_storage_drs_vm_override_test.go b/vsphere/resource_vsphere_storage_drs_vm_override_test.go
@@ -229,7 +229,7 @@ resource "vsphere_virtual_machine" "vm" {
 
   num_cpus = 2
   memory   = 2048
-  guest_id = "other3xLinux64Guest"
+  guest_id = "other3xLinuxGuest"
 
   network_interface {
     network_id = "${data.vsphere_network.network1.id}"
@@ -295,7 +295,7 @@ resource "vsphere_virtual_machine" "vm" {
 
   num_cpus = 2
   memory   = 2048
-  guest_id = "other3xLinux64Guest"
+  guest_id = "other3xLinuxGuest"
 
   network_interface {
     network_id = "${data.vsphere_network.network1.id}"

diff --git a/vsphere/resource_vsphere_vapp_container_test.go b/vsphere/resource_vsphere_vapp_container_test.go
@@ -503,7 +503,7 @@ resource "vsphere_virtual_machine" "vm" {
 
   num_cpus                   = 2
   memory                     = 2048
-  guest_id                   = "other3xLinux64Guest"
+  guest_id                   = "other3xLinuxGuest"
   wait_for_guest_net_timeout = -1
   depends_on                 = ["vsphere_nas_datastore.datastore1"]
 
@@ -582,7 +582,7 @@ resource "vsphere_virtual_machine" "vm" {
 
   num_cpus                   = 2
   memory                     = 2048
-  guest_id                   = "other3xLinux64Guest"
+  guest_id                   = "other3xLinuxGuest"
   wait_for_guest_net_timeout = -1
   depends_on                 = ["vsphere_nas_datastore.datastore1"]
 
@@ -668,7 +668,7 @@ resource "vsphere_virtual_machine" "vm" {
 
   num_cpus                   = 2
   memory                     = 2048
-  guest_id                   = "ubuntu64Guest"
+  guest_id                   = "other3xLinuxGuest"
   wait_for_guest_net_timeout = -1
   depends_on                 = ["vsphere_nas_datastore.datastore1"]
 
@@ -740,7 +740,7 @@ resource "vsphere_virtual_machine" "vm" {
 
   num_cpus                   = 2
   memory                     = 2048
-  guest_id                   = "ubuntu64Guest"
+  guest_id                   = "other3xLinuxGuest"
   wait_for_guest_net_timeout = -1
 
   clone {
@@ -803,7 +803,7 @@ resource "vsphere_virtual_machine" "vm" {
 
   num_cpus                   = 2
   memory                     = 2048
-  guest_id                   = "other3xLinux64Guest"
+  guest_id                   = "other3xLinuxGuest"
   wait_for_guest_net_timeout = -1
 
   disk {
@@ -848,7 +848,7 @@ resource "vsphere_virtual_machine" "vm" {
 
   num_cpus                   = 2
   memory                     = 2048
-  guest_id                   = "other3xLinux64Guest"
+  guest_id                   = "other3xLinuxGuest"
   wait_for_guest_net_timeout = -1
 
   disk {

diff --git a/vsphere/resource_vsphere_vapp_entity_test.go b/vsphere/resource_vsphere_vapp_entity_test.go
@@ -343,7 +343,7 @@ resource "vsphere_virtual_machine" "vm" {
 
 	num_cpus = 2
 	memory   = 2048
-	guest_id = "other3xLinux64Guest"
+	guest_id = "other3xLinuxGuest"
 	wait_for_guest_net_timeout = -1
 
 	
@@ -407,7 +407,7 @@ resource "vsphere_virtual_machine" "vm" {
 
   num_cpus                   = 2
   memory                     = 2048
-  guest_id                   = "other3xLinux64Guest"
+  guest_id                   = "other3xLinuxGuest"
   wait_for_guest_net_timeout = -1
 
   disk {
@@ -462,7 +462,7 @@ resource "vsphere_virtual_machine" "vm1" {
 
   num_cpus                   = 2
   memory                     = 1024
-  guest_id                   = "other3xLinux64Guest"
+  guest_id                   = "other3xLinuxGuest"
   wait_for_guest_net_timeout = -1
 
   disk {
@@ -482,7 +482,7 @@ resource "vsphere_virtual_machine" "vm2" {
 
   num_cpus                   = 2
   memory                     = 1024
-  guest_id                   = "other3xLinux64Guest"
+  guest_id                   = "other3xLinuxGuest"
   wait_for_guest_net_timeout = -1
 
   disk {
@@ -548,7 +548,7 @@ resource "vsphere_virtual_machine" "vm1" {
 
   num_cpus                   = 2
   memory                     = 1024
-  guest_id                   = "other3xLinux64Guest"
+  guest_id                   = "other3xLinuxGuest"
   wait_for_guest_net_timeout = -1
 
   disk {
@@ -568,7 +568,7 @@ resource "vsphere_virtual_machine" "vm2" {
 
   num_cpus                   = 2
   memory                     = 1024
-  guest_id                   = "other3xLinux64Guest"
+  guest_id                   = "other3xLinuxGuest"
   wait_for_guest_net_timeout = -1
 
   disk {