mirror of
https://github.com/letic/terraform-provider-google.git
synced 2024-07-09 11:38:29 +00:00
Fix failing tests: instance templates still use disk
(#504)
* instance templates still use the disk field * more fixes
This commit is contained in:
parent
6fcd65a00a
commit
bbad89afe6
|
@ -149,7 +149,7 @@ resource "google_compute_instance_template" "foobar" {
|
||||||
can_ip_forward = false
|
can_ip_forward = false
|
||||||
tags = ["foo", "bar"]
|
tags = ["foo", "bar"]
|
||||||
|
|
||||||
boot_disk {
|
disk {
|
||||||
source_image = "debian-cloud/debian-8-jessie-v20160803"
|
source_image = "debian-cloud/debian-8-jessie-v20160803"
|
||||||
auto_delete = true
|
auto_delete = true
|
||||||
boot = true
|
boot = true
|
||||||
|
@ -209,7 +209,7 @@ resource "google_compute_instance_template" "foobar" {
|
||||||
can_ip_forward = false
|
can_ip_forward = false
|
||||||
tags = ["foo", "bar"]
|
tags = ["foo", "bar"]
|
||||||
|
|
||||||
boot_disk {
|
disk {
|
||||||
source_image = "debian-cloud/debian-8-jessie-v20160803"
|
source_image = "debian-cloud/debian-8-jessie-v20160803"
|
||||||
auto_delete = true
|
auto_delete = true
|
||||||
boot = true
|
boot = true
|
||||||
|
|
|
@ -422,7 +422,7 @@ resource "google_compute_instance_template" "foobar" {
|
||||||
network = "default"
|
network = "default"
|
||||||
}
|
}
|
||||||
|
|
||||||
boot_disk {
|
disk {
|
||||||
source_image = "debian-8-jessie-v20160803"
|
source_image = "debian-8-jessie-v20160803"
|
||||||
auto_delete = true
|
auto_delete = true
|
||||||
boot = true
|
boot = true
|
||||||
|
|
|
@ -356,12 +356,13 @@ resource "google_compute_instance" "bar" {
|
||||||
zone = "us-central1-a"
|
zone = "us-central1-a"
|
||||||
|
|
||||||
boot_disk {
|
boot_disk {
|
||||||
image = "debian-8-jessie-v20170523"
|
initialize_params {
|
||||||
|
image = "debian-8-jessie-v20170523"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
attached_disk {
|
attached_disk {
|
||||||
disk = "${google_compute_disk.foo.name}"
|
source = "${google_compute_disk.foo.self_link}"
|
||||||
auto_delete = false
|
|
||||||
}
|
}
|
||||||
|
|
||||||
network_interface {
|
network_interface {
|
||||||
|
|
|
@ -501,7 +501,7 @@ func testAccInstanceGroupManager_basic(template, target, igm1, igm2 string) stri
|
||||||
can_ip_forward = false
|
can_ip_forward = false
|
||||||
tags = ["foo", "bar"]
|
tags = ["foo", "bar"]
|
||||||
|
|
||||||
boot_disk {
|
disk {
|
||||||
source_image = "debian-cloud/debian-8-jessie-v20160803"
|
source_image = "debian-cloud/debian-8-jessie-v20160803"
|
||||||
auto_delete = true
|
auto_delete = true
|
||||||
boot = true
|
boot = true
|
||||||
|
@ -555,7 +555,7 @@ func testAccInstanceGroupManager_targetSizeZero(template, igm string) string {
|
||||||
can_ip_forward = false
|
can_ip_forward = false
|
||||||
tags = ["foo", "bar"]
|
tags = ["foo", "bar"]
|
||||||
|
|
||||||
boot_disk {
|
disk {
|
||||||
source_image = "debian-cloud/debian-8-jessie-v20160803"
|
source_image = "debian-cloud/debian-8-jessie-v20160803"
|
||||||
auto_delete = true
|
auto_delete = true
|
||||||
boot = true
|
boot = true
|
||||||
|
@ -592,7 +592,7 @@ func testAccInstanceGroupManager_update(template, target, igm string) string {
|
||||||
can_ip_forward = false
|
can_ip_forward = false
|
||||||
tags = ["foo", "bar"]
|
tags = ["foo", "bar"]
|
||||||
|
|
||||||
boot_disk {
|
disk {
|
||||||
source_image = "debian-cloud/debian-8-jessie-v20160803"
|
source_image = "debian-cloud/debian-8-jessie-v20160803"
|
||||||
auto_delete = true
|
auto_delete = true
|
||||||
boot = true
|
boot = true
|
||||||
|
@ -641,7 +641,7 @@ func testAccInstanceGroupManager_update2(template1, target1, target2, template2,
|
||||||
can_ip_forward = false
|
can_ip_forward = false
|
||||||
tags = ["foo", "bar"]
|
tags = ["foo", "bar"]
|
||||||
|
|
||||||
boot_disk {
|
disk {
|
||||||
source_image = "debian-cloud/debian-8-jessie-v20160803"
|
source_image = "debian-cloud/debian-8-jessie-v20160803"
|
||||||
auto_delete = true
|
auto_delete = true
|
||||||
boot = true
|
boot = true
|
||||||
|
@ -678,7 +678,7 @@ func testAccInstanceGroupManager_update2(template1, target1, target2, template2,
|
||||||
can_ip_forward = false
|
can_ip_forward = false
|
||||||
tags = ["foo", "bar"]
|
tags = ["foo", "bar"]
|
||||||
|
|
||||||
boot_disk {
|
disk {
|
||||||
source_image = "debian-cloud/debian-8-jessie-v20160803"
|
source_image = "debian-cloud/debian-8-jessie-v20160803"
|
||||||
auto_delete = true
|
auto_delete = true
|
||||||
boot = true
|
boot = true
|
||||||
|
@ -726,7 +726,7 @@ func testAccInstanceGroupManager_updateLifecycle(tag, igm string) string {
|
||||||
can_ip_forward = false
|
can_ip_forward = false
|
||||||
tags = ["%s"]
|
tags = ["%s"]
|
||||||
|
|
||||||
boot_disk {
|
disk {
|
||||||
source_image = "debian-cloud/debian-8-jessie-v20160803"
|
source_image = "debian-cloud/debian-8-jessie-v20160803"
|
||||||
auto_delete = true
|
auto_delete = true
|
||||||
boot = true
|
boot = true
|
||||||
|
@ -766,7 +766,7 @@ func testAccInstanceGroupManager_updateStrategy(igm string) string {
|
||||||
can_ip_forward = false
|
can_ip_forward = false
|
||||||
tags = ["terraform-testing"]
|
tags = ["terraform-testing"]
|
||||||
|
|
||||||
boot_disk {
|
disk {
|
||||||
source_image = "debian-cloud/debian-8-jessie-v20160803"
|
source_image = "debian-cloud/debian-8-jessie-v20160803"
|
||||||
auto_delete = true
|
auto_delete = true
|
||||||
boot = true
|
boot = true
|
||||||
|
@ -807,7 +807,7 @@ func testAccInstanceGroupManager_separateRegions(igm1, igm2 string) string {
|
||||||
can_ip_forward = false
|
can_ip_forward = false
|
||||||
tags = ["foo", "bar"]
|
tags = ["foo", "bar"]
|
||||||
|
|
||||||
boot_disk {
|
disk {
|
||||||
source_image = "debian-cloud/debian-8-jessie-v20160803"
|
source_image = "debian-cloud/debian-8-jessie-v20160803"
|
||||||
auto_delete = true
|
auto_delete = true
|
||||||
boot = true
|
boot = true
|
||||||
|
@ -853,7 +853,7 @@ resource "google_compute_instance_template" "igm-basic" {
|
||||||
machine_type = "n1-standard-1"
|
machine_type = "n1-standard-1"
|
||||||
can_ip_forward = false
|
can_ip_forward = false
|
||||||
tags = ["foo", "bar"]
|
tags = ["foo", "bar"]
|
||||||
boot_disk {
|
disk {
|
||||||
source_image = "debian-cloud/debian-8-jessie-v20160803"
|
source_image = "debian-cloud/debian-8-jessie-v20160803"
|
||||||
auto_delete = true
|
auto_delete = true
|
||||||
boot = true
|
boot = true
|
||||||
|
@ -909,7 +909,7 @@ resource "google_compute_instance_template" "igm-basic" {
|
||||||
machine_type = "n1-standard-1"
|
machine_type = "n1-standard-1"
|
||||||
can_ip_forward = false
|
can_ip_forward = false
|
||||||
tags = ["foo", "bar"]
|
tags = ["foo", "bar"]
|
||||||
boot_disk {
|
disk {
|
||||||
source_image = "debian-cloud/debian-8-jessie-v20160803"
|
source_image = "debian-cloud/debian-8-jessie-v20160803"
|
||||||
auto_delete = true
|
auto_delete = true
|
||||||
boot = true
|
boot = true
|
||||||
|
|
|
@ -419,7 +419,7 @@ resource "google_compute_instance_template" "foobar" {
|
||||||
can_ip_forward = false
|
can_ip_forward = false
|
||||||
tags = ["foo", "bar"]
|
tags = ["foo", "bar"]
|
||||||
|
|
||||||
boot_disk {
|
disk {
|
||||||
source_image = "debian-8-jessie-v20160803"
|
source_image = "debian-8-jessie-v20160803"
|
||||||
auto_delete = true
|
auto_delete = true
|
||||||
boot = true
|
boot = true
|
||||||
|
@ -450,7 +450,7 @@ resource "google_compute_instance_template" "foobar" {
|
||||||
can_ip_forward = false
|
can_ip_forward = false
|
||||||
tags = ["foo", "bar"]
|
tags = ["foo", "bar"]
|
||||||
|
|
||||||
boot_disk {
|
disk {
|
||||||
source_image = "debian-8-jessie-v20160803"
|
source_image = "debian-8-jessie-v20160803"
|
||||||
auto_delete = true
|
auto_delete = true
|
||||||
boot = true
|
boot = true
|
||||||
|
@ -484,7 +484,7 @@ resource "google_compute_instance_template" "foobar" {
|
||||||
machine_type = "n1-standard-1"
|
machine_type = "n1-standard-1"
|
||||||
tags = ["foo", "bar"]
|
tags = ["foo", "bar"]
|
||||||
|
|
||||||
boot_disk {
|
disk {
|
||||||
source_image = "debian-8-jessie-v20160803"
|
source_image = "debian-8-jessie-v20160803"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -507,7 +507,7 @@ resource "google_compute_instance_template" "foobar" {
|
||||||
machine_type = "n1-standard-1"
|
machine_type = "n1-standard-1"
|
||||||
tags = ["foo", "bar"]
|
tags = ["foo", "bar"]
|
||||||
|
|
||||||
boot_disk {
|
disk {
|
||||||
source_image = "debian-8-jessie-v20160803"
|
source_image = "debian-8-jessie-v20160803"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -535,14 +535,14 @@ resource "google_compute_instance_template" "foobar" {
|
||||||
name = "instancet-test-%s"
|
name = "instancet-test-%s"
|
||||||
machine_type = "n1-standard-1"
|
machine_type = "n1-standard-1"
|
||||||
|
|
||||||
boot_disk {
|
disk {
|
||||||
source_image = "debian-8-jessie-v20160803"
|
source_image = "debian-8-jessie-v20160803"
|
||||||
auto_delete = true
|
auto_delete = true
|
||||||
disk_size_gb = 100
|
disk_size_gb = 100
|
||||||
boot = true
|
boot = true
|
||||||
}
|
}
|
||||||
|
|
||||||
attached_disk {
|
disk {
|
||||||
source = "terraform-test-foobar"
|
source = "terraform-test-foobar"
|
||||||
auto_delete = false
|
auto_delete = false
|
||||||
boot = false
|
boot = false
|
||||||
|
@ -568,7 +568,7 @@ func testAccComputeInstanceTemplate_subnet_auto(network string) string {
|
||||||
name = "instance-tpl-%s"
|
name = "instance-tpl-%s"
|
||||||
machine_type = "n1-standard-1"
|
machine_type = "n1-standard-1"
|
||||||
|
|
||||||
boot_disk {
|
disk {
|
||||||
source_image = "debian-8-jessie-v20160803"
|
source_image = "debian-8-jessie-v20160803"
|
||||||
auto_delete = true
|
auto_delete = true
|
||||||
disk_size_gb = 10
|
disk_size_gb = 10
|
||||||
|
@ -603,7 +603,7 @@ resource "google_compute_instance_template" "foobar" {
|
||||||
machine_type = "n1-standard-1"
|
machine_type = "n1-standard-1"
|
||||||
region = "us-central1"
|
region = "us-central1"
|
||||||
|
|
||||||
boot_disk {
|
disk {
|
||||||
source_image = "debian-8-jessie-v20160803"
|
source_image = "debian-8-jessie-v20160803"
|
||||||
auto_delete = true
|
auto_delete = true
|
||||||
disk_size_gb = 10
|
disk_size_gb = 10
|
||||||
|
@ -640,7 +640,7 @@ func testAccComputeInstanceTemplate_subnet_xpn(xpn_host string) string {
|
||||||
machine_type = "n1-standard-1"
|
machine_type = "n1-standard-1"
|
||||||
region = "us-central1"
|
region = "us-central1"
|
||||||
|
|
||||||
boot_disk {
|
disk {
|
||||||
source_image = "debian-8-jessie-v20160803"
|
source_image = "debian-8-jessie-v20160803"
|
||||||
auto_delete = true
|
auto_delete = true
|
||||||
disk_size_gb = 10
|
disk_size_gb = 10
|
||||||
|
@ -663,7 +663,7 @@ resource "google_compute_instance_template" "foobar" {
|
||||||
name = "instance-test-%s"
|
name = "instance-test-%s"
|
||||||
machine_type = "n1-standard-1"
|
machine_type = "n1-standard-1"
|
||||||
|
|
||||||
boot_disk {
|
disk {
|
||||||
source_image = "debian-8-jessie-v20160803"
|
source_image = "debian-8-jessie-v20160803"
|
||||||
auto_delete = true
|
auto_delete = true
|
||||||
disk_size_gb = 10
|
disk_size_gb = 10
|
||||||
|
|
|
@ -325,7 +325,7 @@ resource "google_compute_instance_template" "foobar" {
|
||||||
network = "default"
|
network = "default"
|
||||||
}
|
}
|
||||||
|
|
||||||
boot_disk {
|
disk {
|
||||||
source_image = "debian-8-jessie-v20160803"
|
source_image = "debian-8-jessie-v20160803"
|
||||||
auto_delete = true
|
auto_delete = true
|
||||||
boot = true
|
boot = true
|
||||||
|
|
|
@ -432,7 +432,7 @@ func testAccRegionInstanceGroupManager_basic(template, target, igm1, igm2 string
|
||||||
can_ip_forward = false
|
can_ip_forward = false
|
||||||
tags = ["foo", "bar"]
|
tags = ["foo", "bar"]
|
||||||
|
|
||||||
boot_disk {
|
disk {
|
||||||
source_image = "debian-cloud/debian-8-jessie-v20160803"
|
source_image = "debian-cloud/debian-8-jessie-v20160803"
|
||||||
auto_delete = true
|
auto_delete = true
|
||||||
boot = true
|
boot = true
|
||||||
|
@ -486,7 +486,7 @@ func testAccRegionInstanceGroupManager_targetSizeZero(template, igm string) stri
|
||||||
can_ip_forward = false
|
can_ip_forward = false
|
||||||
tags = ["foo", "bar"]
|
tags = ["foo", "bar"]
|
||||||
|
|
||||||
boot_disk {
|
disk {
|
||||||
source_image = "debian-cloud/debian-8-jessie-v20160803"
|
source_image = "debian-cloud/debian-8-jessie-v20160803"
|
||||||
auto_delete = true
|
auto_delete = true
|
||||||
boot = true
|
boot = true
|
||||||
|
@ -523,7 +523,7 @@ func testAccRegionInstanceGroupManager_update(template, target, igm string) stri
|
||||||
can_ip_forward = false
|
can_ip_forward = false
|
||||||
tags = ["foo", "bar"]
|
tags = ["foo", "bar"]
|
||||||
|
|
||||||
boot_disk {
|
disk {
|
||||||
source_image = "debian-cloud/debian-8-jessie-v20160803"
|
source_image = "debian-cloud/debian-8-jessie-v20160803"
|
||||||
auto_delete = true
|
auto_delete = true
|
||||||
boot = true
|
boot = true
|
||||||
|
@ -572,7 +572,7 @@ func testAccRegionInstanceGroupManager_update2(template1, target1, target2, temp
|
||||||
can_ip_forward = false
|
can_ip_forward = false
|
||||||
tags = ["foo", "bar"]
|
tags = ["foo", "bar"]
|
||||||
|
|
||||||
boot_disk {
|
disk {
|
||||||
source_image = "debian-cloud/debian-8-jessie-v20160803"
|
source_image = "debian-cloud/debian-8-jessie-v20160803"
|
||||||
auto_delete = true
|
auto_delete = true
|
||||||
boot = true
|
boot = true
|
||||||
|
@ -609,7 +609,7 @@ func testAccRegionInstanceGroupManager_update2(template1, target1, target2, temp
|
||||||
can_ip_forward = false
|
can_ip_forward = false
|
||||||
tags = ["foo", "bar"]
|
tags = ["foo", "bar"]
|
||||||
|
|
||||||
boot_disk {
|
disk {
|
||||||
source_image = "debian-cloud/debian-8-jessie-v20160803"
|
source_image = "debian-cloud/debian-8-jessie-v20160803"
|
||||||
auto_delete = true
|
auto_delete = true
|
||||||
boot = true
|
boot = true
|
||||||
|
@ -657,7 +657,7 @@ func testAccRegionInstanceGroupManager_updateLifecycle(tag, igm string) string {
|
||||||
can_ip_forward = false
|
can_ip_forward = false
|
||||||
tags = ["%s"]
|
tags = ["%s"]
|
||||||
|
|
||||||
boot_disk {
|
disk {
|
||||||
source_image = "debian-cloud/debian-8-jessie-v20160803"
|
source_image = "debian-cloud/debian-8-jessie-v20160803"
|
||||||
auto_delete = true
|
auto_delete = true
|
||||||
boot = true
|
boot = true
|
||||||
|
@ -697,7 +697,7 @@ func testAccRegionInstanceGroupManager_separateRegions(igm1, igm2 string) string
|
||||||
can_ip_forward = false
|
can_ip_forward = false
|
||||||
tags = ["foo", "bar"]
|
tags = ["foo", "bar"]
|
||||||
|
|
||||||
boot_disk {
|
disk {
|
||||||
source_image = "debian-cloud/debian-8-jessie-v20160803"
|
source_image = "debian-cloud/debian-8-jessie-v20160803"
|
||||||
auto_delete = true
|
auto_delete = true
|
||||||
boot = true
|
boot = true
|
||||||
|
@ -743,7 +743,7 @@ resource "google_compute_instance_template" "igm-basic" {
|
||||||
machine_type = "n1-standard-1"
|
machine_type = "n1-standard-1"
|
||||||
can_ip_forward = false
|
can_ip_forward = false
|
||||||
tags = ["foo", "bar"]
|
tags = ["foo", "bar"]
|
||||||
boot_disk {
|
disk {
|
||||||
source_image = "debian-cloud/debian-8-jessie-v20160803"
|
source_image = "debian-cloud/debian-8-jessie-v20160803"
|
||||||
auto_delete = true
|
auto_delete = true
|
||||||
boot = true
|
boot = true
|
||||||
|
|
Loading…
Reference in New Issue
Block a user