Merge pull request #8 from newcontext-oss/kevinbuchs-maintenance/upda…

…tes-docs-scripts discovered that one case of Terraform 12 code that works with Terrafo…
newcontext-oss · Aug 7, 2019 · 7cb6e4c · 7cb6e4c
2 parents f298835 + 12f7317
commit 7cb6e4c
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 5 deletions.
diff --git a/README.md b/README.md
@@ -132,7 +132,6 @@ Here are **some** of the things necessary to migrate.
 1. Edit Gemfile to change version requirements to be this:
    - gem 'inspec', '~> 4.0'
    - gem 'kitchen-terraform', '>= 4.0.0'
-1. Edit main.tf to change syntax of metadata, at the bottom. See the comment.
 1. Testing (verify stage) does not pass - there seem to be problems with the inspec plugins. 
 
 ## Authors

diff --git a/bin/example-setup-ubuntu.sh b/bin/example-setup-ubuntu.sh
@@ -7,7 +7,7 @@
 # Modify these to your liking
 TF_BIN_LOCATION=/usr/local/bin
 GCLOUD_REGION="us-west1"
-GCLOUD_ZONE="${GCLOUD_REGION}a"
+GCLOUD_ZONE="${GCLOUD_REGION}-a"
 GOOGLE_CREDS="$(pwd)/credentials.json"
 
 UBUN_VERSION=$(grep '^VERSION=' /etc/os-release|  \

diff --git a/main.tf b/main.tf
@@ -22,10 +22,7 @@ resource "google_compute_instance" "database" {
     }
   }
 
-
-  # uncomment this next code line and comment the following to enable Terraform 0.12+ functionality
   metadata = {
-  # metadata {
     sshKeys = "ubuntu:${file(var.ssh_public_key_filepath)}"
   }