From 084283233a780732427f151cc230755df0ed0509 Mon Sep 17 00:00:00 2001 From: Strahinja Kustudic Date: Wed, 26 Jun 2019 09:40:50 +0200 Subject: [PATCH] Set correct version and update changelog fragment --- .../fragments/add-env-variables-to-gcp-compute.yml | 2 +- lib/ansible/plugins/inventory/gcp_compute.py | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/changelogs/fragments/add-env-variables-to-gcp-compute.yml b/changelogs/fragments/add-env-variables-to-gcp-compute.yml index c13a15bfe06..f2678241035 100644 --- a/changelogs/fragments/add-env-variables-to-gcp-compute.yml +++ b/changelogs/fragments/add-env-variables-to-gcp-compute.yml @@ -1,2 +1,2 @@ minor_changes: - - gcp_compute - Added additional environment variables to the `gcp_compute` inventory plugin to align with the rest of the `gcp_*` modules. + - gcp_compute - Added additional environment variables to the ``gcp_compute`` inventory plugin to align with the rest of the ``gcp_*`` modules. diff --git a/lib/ansible/plugins/inventory/gcp_compute.py b/lib/ansible/plugins/inventory/gcp_compute.py index 87c6338a7ff..2404c7de8fc 100644 --- a/lib/ansible/plugins/inventory/gcp_compute.py +++ b/lib/ansible/plugins/inventory/gcp_compute.py @@ -50,21 +50,21 @@ DOCUMENTATION = ''' choices: ['application', 'serviceaccount', 'machineaccount'] env: - name: GCP_AUTH_KIND - version_added: "2.8" + version_added: "2.8.2" scopes: description: list of authentication scopes type: list default: ['https://www.googleapis.com/auth/compute'] env: - name: GCP_SCOPES - version_added: "2.8" + version_added: "2.8.2" service_account_file: description: - The path of a Service Account JSON file if serviceaccount is selected as type. type: path env: - name: GCP_SERVICE_ACCOUNT_FILE - version_added: "2.8" + version_added: "2.8.2" - name: GCE_CREDENTIALS_FILE_PATH version_added: "2.8" service_account_contents: @@ -74,14 +74,14 @@ DOCUMENTATION = ''' type: string env: - name: GCP_SERVICE_ACCOUNT_CONTENTS - version_added: "2.8" + version_added: "2.8.2" service_account_email: description: - An optional service account email address if machineaccount is selected and the user does not wish to use the default email. env: - name: GCP_SERVICE_ACCOUNT_EMAIL - version_added: "2.8" + version_added: "2.8.2" vars_prefix: description: prefix to apply to host variables, does not include facts nor params default: ''