provider/google: use non-deprecated image in acceptance tests, documentation
This commit is contained in:
parent
07fee770e4
commit
1ccfacd2dd
|
@ -139,7 +139,7 @@ resource "google_compute_instance_template" "foobar" {
|
|||
tags = ["foo", "bar"]
|
||||
|
||||
disk {
|
||||
source_image = "debian-cloud/debian-7-wheezy-v20140814"
|
||||
source_image = "debian-cloud/debian-7-wheezy-v20160301"
|
||||
auto_delete = true
|
||||
boot = true
|
||||
}
|
||||
|
@ -196,7 +196,7 @@ resource "google_compute_instance_template" "foobar" {
|
|||
tags = ["foo", "bar"]
|
||||
|
||||
disk {
|
||||
source_image = "debian-cloud/debian-7-wheezy-v20140814"
|
||||
source_image = "debian-cloud/debian-7-wheezy-v20160301"
|
||||
auto_delete = true
|
||||
boot = true
|
||||
}
|
||||
|
|
|
@ -194,7 +194,7 @@ resource "google_compute_instance_template" "foobar" {
|
|||
}
|
||||
|
||||
disk {
|
||||
source_image = "debian-7-wheezy-v20140814"
|
||||
source_image = "debian-7-wheezy-v20160301"
|
||||
auto_delete = true
|
||||
boot = true
|
||||
}
|
||||
|
|
|
@ -81,7 +81,7 @@ func testAccComputeDisk_basic(diskName string) string {
|
|||
return fmt.Sprintf(`
|
||||
resource "google_compute_disk" "foobar" {
|
||||
name = "%s"
|
||||
image = "debian-7-wheezy-v20140814"
|
||||
image = "debian-7-wheezy-v20160301"
|
||||
size = 50
|
||||
type = "pd-ssd"
|
||||
zone = "us-central1-a"
|
||||
|
|
|
@ -210,7 +210,7 @@ func testAccInstanceGroupManager_basic(template, target, igm1, igm2 string) stri
|
|||
tags = ["foo", "bar"]
|
||||
|
||||
disk {
|
||||
source_image = "debian-cloud/debian-7-wheezy-v20140814"
|
||||
source_image = "debian-cloud/debian-7-wheezy-v20160301"
|
||||
auto_delete = true
|
||||
boot = true
|
||||
}
|
||||
|
@ -264,7 +264,7 @@ func testAccInstanceGroupManager_update(template, target, igm string) string {
|
|||
tags = ["foo", "bar"]
|
||||
|
||||
disk {
|
||||
source_image = "debian-cloud/debian-7-wheezy-v20140814"
|
||||
source_image = "debian-cloud/debian-7-wheezy-v20160301"
|
||||
auto_delete = true
|
||||
boot = true
|
||||
}
|
||||
|
@ -313,7 +313,7 @@ func testAccInstanceGroupManager_update2(template1, target, template2, igm strin
|
|||
tags = ["foo", "bar"]
|
||||
|
||||
disk {
|
||||
source_image = "debian-cloud/debian-7-wheezy-v20140814"
|
||||
source_image = "debian-cloud/debian-7-wheezy-v20160301"
|
||||
auto_delete = true
|
||||
boot = true
|
||||
}
|
||||
|
@ -344,7 +344,7 @@ func testAccInstanceGroupManager_update2(template1, target, template2, igm strin
|
|||
tags = ["foo", "bar"]
|
||||
|
||||
disk {
|
||||
source_image = "debian-cloud/debian-7-wheezy-v20140814"
|
||||
source_image = "debian-cloud/debian-7-wheezy-v20160301"
|
||||
auto_delete = true
|
||||
boot = true
|
||||
}
|
||||
|
|
|
@ -190,7 +190,7 @@ func testAccComputeInstanceGroup_basic(instance string) string {
|
|||
zone = "us-central1-c"
|
||||
|
||||
disk {
|
||||
image = "debian-7-wheezy-v20140814"
|
||||
image = "debian-7-wheezy-v20160301"
|
||||
}
|
||||
|
||||
network_interface {
|
||||
|
@ -238,7 +238,7 @@ func testAccComputeInstanceGroup_update(instance string) string {
|
|||
count = 1
|
||||
|
||||
disk {
|
||||
image = "debian-7-wheezy-v20140814"
|
||||
image = "debian-7-wheezy-v20160301"
|
||||
}
|
||||
|
||||
network_interface {
|
||||
|
@ -273,7 +273,7 @@ func testAccComputeInstanceGroup_update2(instance string) string {
|
|||
count = 3
|
||||
|
||||
disk {
|
||||
image = "debian-7-wheezy-v20140814"
|
||||
image = "debian-7-wheezy-v20160301"
|
||||
}
|
||||
|
||||
network_interface {
|
||||
|
|
|
@ -26,7 +26,7 @@ func TestAccComputeInstanceTemplate_basic(t *testing.T) {
|
|||
"google_compute_instance_template.foobar", &instanceTemplate),
|
||||
testAccCheckComputeInstanceTemplateTag(&instanceTemplate, "foo"),
|
||||
testAccCheckComputeInstanceTemplateMetadata(&instanceTemplate, "foo", "bar"),
|
||||
testAccCheckComputeInstanceTemplateDisk(&instanceTemplate, "https://www.googleapis.com/compute/v1/projects/debian-cloud/global/images/debian-7-wheezy-v20140814", true, true),
|
||||
testAccCheckComputeInstanceTemplateDisk(&instanceTemplate, "https://www.googleapis.com/compute/v1/projects/debian-cloud/global/images/debian-7-wheezy-v20160301", true, true),
|
||||
),
|
||||
},
|
||||
},
|
||||
|
@ -66,7 +66,7 @@ func TestAccComputeInstanceTemplate_disks(t *testing.T) {
|
|||
Check: resource.ComposeTestCheckFunc(
|
||||
testAccCheckComputeInstanceTemplateExists(
|
||||
"google_compute_instance_template.foobar", &instanceTemplate),
|
||||
testAccCheckComputeInstanceTemplateDisk(&instanceTemplate, "https://www.googleapis.com/compute/v1/projects/debian-cloud/global/images/debian-7-wheezy-v20140814", true, true),
|
||||
testAccCheckComputeInstanceTemplateDisk(&instanceTemplate, "https://www.googleapis.com/compute/v1/projects/debian-cloud/global/images/debian-7-wheezy-v20160301", true, true),
|
||||
testAccCheckComputeInstanceTemplateDisk(&instanceTemplate, "terraform-test-foobar", false, false),
|
||||
),
|
||||
},
|
||||
|
@ -276,7 +276,7 @@ resource "google_compute_instance_template" "foobar" {
|
|||
tags = ["foo", "bar"]
|
||||
|
||||
disk {
|
||||
source_image = "debian-7-wheezy-v20140814"
|
||||
source_image = "debian-7-wheezy-v20160301"
|
||||
auto_delete = true
|
||||
boot = true
|
||||
}
|
||||
|
@ -310,7 +310,7 @@ resource "google_compute_instance_template" "foobar" {
|
|||
tags = ["foo", "bar"]
|
||||
|
||||
disk {
|
||||
source_image = "debian-7-wheezy-v20140814"
|
||||
source_image = "debian-7-wheezy-v20160301"
|
||||
}
|
||||
|
||||
network_interface {
|
||||
|
@ -328,7 +328,7 @@ resource "google_compute_instance_template" "foobar" {
|
|||
var testAccComputeInstanceTemplate_disks = fmt.Sprintf(`
|
||||
resource "google_compute_disk" "foobar" {
|
||||
name = "instancet-test-%s"
|
||||
image = "debian-7-wheezy-v20140814"
|
||||
image = "debian-7-wheezy-v20160301"
|
||||
size = 10
|
||||
type = "pd-ssd"
|
||||
zone = "us-central1-a"
|
||||
|
@ -339,7 +339,7 @@ resource "google_compute_instance_template" "foobar" {
|
|||
machine_type = "n1-standard-1"
|
||||
|
||||
disk {
|
||||
source_image = "debian-7-wheezy-v20140814"
|
||||
source_image = "debian-7-wheezy-v20160301"
|
||||
auto_delete = true
|
||||
disk_size_gb = 100
|
||||
boot = true
|
||||
|
|
|
@ -515,7 +515,7 @@ func testAccComputeInstance_basic_deprecated_network(instance string) string {
|
|||
tags = ["foo", "bar"]
|
||||
|
||||
disk {
|
||||
image = "debian-7-wheezy-v20140814"
|
||||
image = "debian-7-wheezy-v20160301"
|
||||
}
|
||||
|
||||
network {
|
||||
|
@ -537,7 +537,7 @@ func testAccComputeInstance_update_deprecated_network(instance string) string {
|
|||
tags = ["baz"]
|
||||
|
||||
disk {
|
||||
image = "debian-7-wheezy-v20140814"
|
||||
image = "debian-7-wheezy-v20160301"
|
||||
}
|
||||
|
||||
network {
|
||||
|
@ -560,7 +560,7 @@ func testAccComputeInstance_basic(instance string) string {
|
|||
tags = ["foo", "bar"]
|
||||
|
||||
disk {
|
||||
image = "debian-7-wheezy-v20140814"
|
||||
image = "debian-7-wheezy-v20160301"
|
||||
}
|
||||
|
||||
network_interface {
|
||||
|
@ -586,7 +586,7 @@ func testAccComputeInstance_basic2(instance string) string {
|
|||
tags = ["foo", "bar"]
|
||||
|
||||
disk {
|
||||
image = "debian-cloud/debian-7-wheezy-v20140814"
|
||||
image = "debian-cloud/debian-7-wheezy-v20160301"
|
||||
}
|
||||
|
||||
network_interface {
|
||||
|
@ -610,7 +610,7 @@ func testAccComputeInstance_basic3(instance string) string {
|
|||
tags = ["foo", "bar"]
|
||||
|
||||
disk {
|
||||
image = "https://www.googleapis.com/compute/v1/projects/debian-cloud/global/images/debian-7-wheezy-v20140814"
|
||||
image = "https://www.googleapis.com/compute/v1/projects/debian-cloud/global/images/debian-7-wheezy-v20160301"
|
||||
}
|
||||
|
||||
network_interface {
|
||||
|
@ -635,7 +635,7 @@ func testAccComputeInstance_forceNewAndChangeMetadata(instance string) string {
|
|||
tags = ["baz"]
|
||||
|
||||
disk {
|
||||
image = "debian-7-wheezy-v20140814"
|
||||
image = "debian-7-wheezy-v20160301"
|
||||
}
|
||||
|
||||
network_interface {
|
||||
|
@ -659,7 +659,7 @@ func testAccComputeInstance_update(instance string) string {
|
|||
tags = ["baz"]
|
||||
|
||||
disk {
|
||||
image = "debian-7-wheezy-v20140814"
|
||||
image = "debian-7-wheezy-v20160301"
|
||||
}
|
||||
|
||||
network_interface {
|
||||
|
@ -686,7 +686,7 @@ func testAccComputeInstance_ip(ip, instance string) string {
|
|||
tags = ["foo", "bar"]
|
||||
|
||||
disk {
|
||||
image = "debian-7-wheezy-v20140814"
|
||||
image = "debian-7-wheezy-v20160301"
|
||||
}
|
||||
|
||||
network_interface {
|
||||
|
@ -717,7 +717,7 @@ func testAccComputeInstance_disks(disk, instance string) string {
|
|||
zone = "us-central1-a"
|
||||
|
||||
disk {
|
||||
image = "debian-7-wheezy-v20140814"
|
||||
image = "debian-7-wheezy-v20160301"
|
||||
}
|
||||
|
||||
disk {
|
||||
|
@ -743,7 +743,7 @@ func testAccComputeInstance_local_ssd(instance string) string {
|
|||
zone = "us-central1-a"
|
||||
|
||||
disk {
|
||||
image = "debian-7-wheezy-v20140814"
|
||||
image = "debian-7-wheezy-v20160301"
|
||||
}
|
||||
|
||||
disk {
|
||||
|
@ -766,7 +766,7 @@ func testAccComputeInstance_service_account(instance string) string {
|
|||
zone = "us-central1-a"
|
||||
|
||||
disk {
|
||||
image = "debian-7-wheezy-v20140814"
|
||||
image = "debian-7-wheezy-v20160301"
|
||||
}
|
||||
|
||||
network_interface {
|
||||
|
@ -791,7 +791,7 @@ func testAccComputeInstance_scheduling(instance string) string {
|
|||
zone = "us-central1-a"
|
||||
|
||||
disk {
|
||||
image = "debian-7-wheezy-v20140814"
|
||||
image = "debian-7-wheezy-v20160301"
|
||||
}
|
||||
|
||||
network_interface {
|
||||
|
@ -816,7 +816,7 @@ func testAccComputeInstance_subnet_auto(instance string) string {
|
|||
zone = "us-central1-a"
|
||||
|
||||
disk {
|
||||
image = "debian-7-wheezy-v20140814"
|
||||
image = "debian-7-wheezy-v20160301"
|
||||
}
|
||||
|
||||
network_interface {
|
||||
|
@ -847,7 +847,7 @@ func testAccComputeInstance_subnet_custom(instance string) string {
|
|||
zone = "us-central1-a"
|
||||
|
||||
disk {
|
||||
image = "debian-7-wheezy-v20140814"
|
||||
image = "debian-7-wheezy-v20160301"
|
||||
}
|
||||
|
||||
network_interface {
|
||||
|
|
|
@ -28,7 +28,7 @@ resource "google_compute_instance_template" "foobar" {
|
|||
tags = ["foo", "bar"]
|
||||
|
||||
disk {
|
||||
source_image = "debian-cloud/debian-7-wheezy-v20140814"
|
||||
source_image = "debian-cloud/debian-7-wheezy-v20160301"
|
||||
}
|
||||
|
||||
network_interface {
|
||||
|
|
|
@ -45,7 +45,7 @@ resource "google_compute_instance_template" "foobar" {
|
|||
}
|
||||
|
||||
disk {
|
||||
source_image = "debian-7-wheezy-v20140814"
|
||||
source_image = "debian-7-wheezy-v20160301"
|
||||
auto_delete = true
|
||||
boot = true
|
||||
}
|
||||
|
|
|
@ -24,7 +24,7 @@ resource "google_compute_instance" "default" {
|
|||
tags = ["foo", "bar"]
|
||||
|
||||
disk {
|
||||
image = "debian-7-wheezy-v20140814"
|
||||
image = "debian-7-wheezy-v20160301"
|
||||
}
|
||||
|
||||
// Local SSD disk
|
||||
|
|
|
@ -30,7 +30,7 @@ resource "google_compute_instance_template" "foobar" {
|
|||
|
||||
# Create a new boot disk from an image
|
||||
disk {
|
||||
source_image = "debian-7-wheezy-v20140814"
|
||||
source_image = "debian-7-wheezy-v20160301"
|
||||
auto_delete = true
|
||||
boot = true
|
||||
}
|
||||
|
|
|
@ -21,7 +21,7 @@ resource "google_compute_instance" "frontend" {
|
|||
zone = "us-central1-b"
|
||||
|
||||
disk {
|
||||
image = "debian-7-wheezy-v20140814"
|
||||
image = "debian-7-wheezy-v20160301"
|
||||
}
|
||||
|
||||
network_interface {
|
||||
|
|
Loading…
Reference in New Issue