From a1021f32e11d95c66935df21e71102a510082e6b Mon Sep 17 00:00:00 2001 From: Christoph Blecker Date: Sat, 4 Jun 2016 16:48:54 -0700 Subject: [PATCH] Fix Google Cloud Two-Tier Example (#7009) --- examples/google-two-tier/main.tf | 4 ++-- examples/google-two-tier/terraform.tfvars.example | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/google-two-tier/main.tf b/examples/google-two-tier/main.tf index c0703a7fe2..6e550060cf 100644 --- a/examples/google-two-tier/main.tf +++ b/examples/google-two-tier/main.tf @@ -36,7 +36,7 @@ resource "google_compute_instance" "www" { tags = ["www-node"] disk { - image = "ubuntu-os-cloud/ubuntu-1404-trusty-v20160314" + image = "ubuntu-os-cloud/ubuntu-1404-trusty-v20160602" } network_interface { @@ -70,7 +70,7 @@ resource "google_compute_instance" "www" { } inline = [ "chmod +x ${var.install_script_dest_path}", - "${var.install_script_dest_path} ${count.index}" + "sudo ${var.install_script_dest_path} ${count.index}" ] } diff --git a/examples/google-two-tier/terraform.tfvars.example b/examples/google-two-tier/terraform.tfvars.example index 5e430ae931..bb045e0e5e 100644 --- a/examples/google-two-tier/terraform.tfvars.example +++ b/examples/google-two-tier/terraform.tfvars.example @@ -1,6 +1,6 @@ region = "us-central1" region_zone = "us-central1-a" project_name = "my-project-id-123" -account_file_path = "~/.gcloud/Terraform.json" +credentials_file_path = "~/.gcloud/Terraform.json" public_key_path = "~/.ssh/gcloud_id_rsa.pub" private_key_path = "~/.ssh/gcloud_id_rsa"