From 8808be339f151d688505cdc24dd0eb22cc9f8d93 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 10 Oct 2018 14:16:13 -0400 Subject: [PATCH 1/4] Grammar fixes for googlecompute.html.md Most of these were suggested by app.grammarly.com --- .../source/docs/builders/googlecompute.html.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/website/source/docs/builders/googlecompute.html.md b/website/source/docs/builders/googlecompute.html.md index fa1cda613..97680e3ea 100644 --- a/website/source/docs/builders/googlecompute.html.md +++ b/website/source/docs/builders/googlecompute.html.md @@ -16,7 +16,7 @@ The `googlecompute` Packer builder is able to create Compute Engine](https://cloud.google.com/products/compute-engine) (GCE) based on existing images. -Building images from scratch is possible, but not with the `googlecompute` Packer builder. +It is possible to build images from scratch, but not with the `googlecompute` Packer builder. The process is recommended only for advanced users, please see [Building GCE Images from Scratch] (https://cloud.google.com/compute/docs/tutorials/building-images) and the [Google Compute Import Post-Processor](/docs/post-processors/googlecompute-import.html) @@ -72,16 +72,16 @@ straightforwarded, it is documented here. 3. Click the "Create credentials" button, select "Service account key" -4. Create new service account that at least has `Compute Engine Instance Admin (v1)` and `Service Account User` roles. +4. Create a new service account that at least has `Compute Engine Instance Admin (v1)` and `Service Account User` roles. -5. Choose `JSON` as Key type and click "Create". +5. Choose `JSON` as the Key type and click "Create". A JSON file will be downloaded automatically. This is your *account file*. ### Precedence of Authentication Methods Packer looks for credentials in the following places, preferring the first location found: -1. A `account_file` option in your packer file. +1. An `account_file` option in your packer file. 2. A JSON file (Service Account) whose path is specified by the `GOOGLE_APPLICATION_CREDENTIALS` environment variable. @@ -101,10 +101,10 @@ Packer looks for credentials in the following places, preferring the first locat ### Basic Example -Below is a fully functioning example. It doesn't do anything useful, since no +Below is a fully functioning example. It doesn't do anything useful since no provisioners or startup-script metadata are defined, but it will effectively repackage an existing GCE image. The account\_file is obtained in the previous -section. If it parses as JSON it is assumed to be the file itself, otherwise it +section. If it parses as JSON it is assumed to be the file itself, otherwise, it is assumed to be the path to the file containing the JSON. ``` json @@ -212,7 +212,7 @@ builder. - `account_file` (string) - The JSON file containing your account credentials. Not required if you run Packer on a GCE instance with a service account. - Instructions for creating file or using service accounts are above. + Instructions for creating the file or using service accounts are above. - `accelerator_count` (number) - Number of guest accelerator cards to add to the launched instance. @@ -261,7 +261,7 @@ builder. instance. - `min_cpu_platform` (string) - A Minimum CPU Platform for VM Instance. - The avalability and default CPU platforms varies across zones, based on + The availability and default CPU platforms varies across zones, based on the hardware available in each GCP zone. [Details](https://cloud.google.com/compute/docs/instances/specify-min-cpu-platform) - `network` (string) - The Google Compute network id or URL to use for the @@ -286,7 +286,7 @@ builder. - `preemptible` (boolean) - If true, launch a preemptible instance. - `region` (string) - The region in which to launch the instance. Defaults to - to the region hosting the specified `zone`. + the region hosting the specified `zone`. - `service_account_email` (string) - The service account to be used for launched instance. Defaults to the project's default service account unless `disable_default_service_account` is true. From 84d343bf7e7e713822af839e56194da3ef7983f6 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 10 Oct 2018 14:18:06 -0400 Subject: [PATCH 2/4] filepath isn't a word --- website/source/docs/builders/googlecompute.html.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/source/docs/builders/googlecompute.html.md b/website/source/docs/builders/googlecompute.html.md index 97680e3ea..fbd2d66da 100644 --- a/website/source/docs/builders/googlecompute.html.md +++ b/website/source/docs/builders/googlecompute.html.md @@ -305,7 +305,7 @@ builder. - `source_image_project_id` (string) - The project ID of the project containing the source image. -- `startup_script_file` (string) - The filepath to a startup script to run on +- `startup_script_file` (string) - The path to a startup script to run on the VM from which the image will be made. - `state_timeout` (string) - The time to wait for instance state changes. From 02ee369f43ce3fb762b1f797d3f47f517fda1871 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 10 Oct 2018 14:19:21 -0400 Subject: [PATCH 3/4] Trying to make Grammarly happy --- website/source/docs/builders/googlecompute.html.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/source/docs/builders/googlecompute.html.md b/website/source/docs/builders/googlecompute.html.md index fbd2d66da..c6333bbbe 100644 --- a/website/source/docs/builders/googlecompute.html.md +++ b/website/source/docs/builders/googlecompute.html.md @@ -261,7 +261,7 @@ builder. instance. - `min_cpu_platform` (string) - A Minimum CPU Platform for VM Instance. - The availability and default CPU platforms varies across zones, based on + Availability and default CPU platforms vary across zones, based on the hardware available in each GCP zone. [Details](https://cloud.google.com/compute/docs/instances/specify-min-cpu-platform) - `network` (string) - The Google Compute network id or URL to use for the From 11075235aeaa9243254d58b964a4d8a5cabf34f0 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 10 Oct 2018 14:40:08 -0400 Subject: [PATCH 4/4] Grammar: anyway --- .github/CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index b3ec404e2..b94280a16 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -1,7 +1,7 @@ # Contributing to Packer **First:** if you're unsure or afraid of _anything_, just ask or submit the -issue or pull request anyways. You won't be yelled at for giving your best +issue or pull request anyway. You won't be yelled at for giving your best effort. The worst that can happen is that you'll be politely asked to change something. We appreciate any sort of contributions, and don't want a wall of rules to get in the way of that.