cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Set correct version and update changelog fragment

Browse source
This commit is contained in:
Strahinja Kustudic 2019-06-26 09:40:50 +02:00 committed by Toshio Kuratomi
parent 2ff60747b4
commit 084283233a
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/add-env-variables-to-gcp-compute.yml
View file

@ -1,2 +1,2 @@
minor_changes: 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.

10
lib/ansible/plugins/inventory/gcp_compute.py
View file

@ -50,21 +50,21 @@ DOCUMENTATION = '''
choices: ['application', 'serviceaccount', 'machineaccount'] choices: ['application', 'serviceaccount', 'machineaccount']
env: env:
- name: GCP_AUTH_KIND - name: GCP_AUTH_KIND
version_added: "2.8" version_added: "2.8.2"
scopes: scopes:
description: list of authentication scopes description: list of authentication scopes
type: list type: list
default: ['https://www.googleapis.com/auth/compute'] default: ['https://www.googleapis.com/auth/compute']
env: env:
- name: GCP_SCOPES - name: GCP_SCOPES
version_added: "2.8" version_added: "2.8.2"
service_account_file: service_account_file:
description: description:
- The path of a Service Account JSON file if serviceaccount is selected as type. - The path of a Service Account JSON file if serviceaccount is selected as type.
type: path type: path
env: env:
- name: GCP_SERVICE_ACCOUNT_FILE - name: GCP_SERVICE_ACCOUNT_FILE
version_added: "2.8" version_added: "2.8.2"
- name: GCE_CREDENTIALS_FILE_PATH - name: GCE_CREDENTIALS_FILE_PATH
version_added: "2.8" version_added: "2.8"
service_account_contents: service_account_contents:
@ -74,14 +74,14 @@ DOCUMENTATION = '''
type: string type: string
env: env:
- name: GCP_SERVICE_ACCOUNT_CONTENTS - name: GCP_SERVICE_ACCOUNT_CONTENTS
version_added: "2.8" version_added: "2.8.2"
service_account_email: service_account_email:
description: description:
- An optional service account email address if machineaccount is selected - An optional service account email address if machineaccount is selected
and the user does not wish to use the default email. and the user does not wish to use the default email.
env: env:
- name: GCP_SERVICE_ACCOUNT_EMAIL - name: GCP_SERVICE_ACCOUNT_EMAIL
version_added: "2.8" version_added: "2.8.2"
vars_prefix: vars_prefix:
description: prefix to apply to host variables, does not include facts nor params description: prefix to apply to host variables, does not include facts nor params
default: '' default: ''