From 9f1f0b4aff29f0759ed06da8e22ce716c2e4e869 Mon Sep 17 00:00:00 2001 From: Evan Brown Date: Thu, 4 Aug 2016 14:12:52 -0700 Subject: [PATCH] providers/google: Allow custom Compute Engine service account This commit allows an operator to specify the e-mail address of a service account to use with a Google Compute Engine instance. If no service account e-mail is provided, the default service account is used. Closes #7985 --- r/compute_instance.html.markdown | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/r/compute_instance.html.markdown b/r/compute_instance.html.markdown index baa14c98..77f89f36 100644 --- a/r/compute_instance.html.markdown +++ b/r/compute_instance.html.markdown @@ -101,6 +101,7 @@ The following arguments are supported: this configuration option are detailed below. * `service_account` - (Optional) Service account to attach to the instance. + Structure is documented below. * `tags` - (Optional) Tags to attach to the instance. @@ -151,6 +152,14 @@ The `access_config` block supports: * `nat_ip` - (Optional) The IP address that will be 1:1 mapped to the instance's network ip. If not given, one will be generated. +The `service_account` block supports: + +* `email` - (Optional) The service account e-mail address. If not given, the + default Google Compute Engine service account is used. + +* `scopes` - (Required) A list of service scopes. Both OAuth2 URLs and gcloud + short names are supported. + (DEPRECATED) The `network` block supports: * `source` - (Required) The name of the network to attach this interface to. @@ -158,11 +167,6 @@ The `access_config` block supports: * `address` - (Optional) The IP address of a reserved IP address to assign to this interface. -The `service_account` block supports: - -* `scopes` - (Required) A list of service scopes. Both OAuth2 URLs and gcloud - short names are supported. - The `scheduling` block supports: * `preemptible` - (Optional) Is the instance preemptible.