ansible-collections/google.cloud
1
0
Fork 0
mirror of https://github.com/ansible-collections/google.cloud.git synced 2025-04-06 02:40:29 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

2.9 rebase (#251)

Browse source 
Signed-off-by: Modular Magician <magic-modules@google.com>
This commit is contained in:
The Magician 2019-05-20 22:38:01 -07:00 • committed by Alex Stephen
parent d9ee4beac6
commit 4ec8fc4c9c
2 changed files with 1 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
plugins/doc_fragment/gcp.py
View file

@ -27,11 +27,6 @@ options:
service_account_file:
description:
- The path of a Service Account JSON file if serviceaccount is selected as type.
service_account_contents:
description:
- A string representing the contents of a Service Account JSON file.
- This should not be passed in as a dictionary, but a string has
the exact contents of a service account json file (valid JSON).
service_account_email:
description:
- An optional service account email address if machineaccount is selected
@ -48,8 +43,6 @@ notes:
c(GCP_SERVICE_ACCOUNT_CONTENTS) env variable.
- For authentication, you can set service_account_email using the
C(GCP_SERVICE_ACCOUNT_EMAIL) env variable.
- For authentication, you can set service_account_contents using the
C(GCP_SERVICE_ACCOUNT_CONTENTS) env variable.
- For authentication, you can set auth_kind using the C(GCP_AUTH_KIND) env
variable.
- For authentication, you can set scopes using the C(GCP_SCOPES) env variable.

2
plugins/modules/gcp_pubsub_subscription.py
View file

@ -142,7 +142,7 @@ options:
If expirationPolicy is not set, a default policy with ttl of 31 days will be
used. The minimum allowed value for expirationPolicy.ttl is 1 day.
required: false
version_added: 2.8
version_added: 2.9
suboptions:
ttl:
description: