From cc24f27857fb9fdffc69c4a51e154b343e1f3aa2 Mon Sep 17 00:00:00 2001 From: The Magician Date: Wed, 23 Oct 2019 16:57:03 -0700 Subject: [PATCH] Bug fixes for GCP modules (#63833) --- .../cloud/google/gcp_compute_instance_template_info.py | 4 ++-- .../cloud/google/gcp_compute_interconnect_attachment_info.py | 4 ++-- lib/ansible/modules/cloud/google/gcp_compute_network.py | 4 ++-- .../cloud/google/gcp_compute_network_endpoint_group.py | 4 ++-- .../cloud/google/gcp_compute_network_endpoint_group_info.py | 4 ++-- lib/ansible/modules/cloud/google/gcp_compute_network_info.py | 4 ++-- lib/ansible/modules/cloud/google/gcp_compute_node_group.py | 4 ++-- .../modules/cloud/google/gcp_compute_node_group_info.py | 4 ++-- lib/ansible/modules/cloud/google/gcp_compute_node_template.py | 4 ++-- .../modules/cloud/google/gcp_compute_node_template_info.py | 4 ++-- .../cloud/google/gcp_compute_region_backend_service.py | 4 ++-- .../cloud/google/gcp_compute_region_backend_service_info.py | 4 ++-- lib/ansible/modules/cloud/google/gcp_compute_region_disk.py | 4 ++-- .../modules/cloud/google/gcp_compute_region_disk_info.py | 4 ++-- lib/ansible/modules/cloud/google/gcp_compute_route.py | 4 ++-- lib/ansible/modules/cloud/google/gcp_compute_route_info.py | 4 ++-- lib/ansible/modules/cloud/google/gcp_compute_router.py | 4 ++-- lib/ansible/modules/cloud/google/gcp_compute_router_info.py | 4 ++-- lib/ansible/modules/cloud/google/gcp_compute_snapshot.py | 4 ++-- lib/ansible/modules/cloud/google/gcp_compute_snapshot_info.py | 4 ++-- .../modules/cloud/google/gcp_compute_ssl_certificate.py | 4 ++-- 21 files changed, 42 insertions(+), 42 deletions(-) diff --git a/lib/ansible/modules/cloud/google/gcp_compute_instance_template_info.py b/lib/ansible/modules/cloud/google/gcp_compute_instance_template_info.py index 20e22afd2f5..a1453c78b13 100644 --- a/lib/ansible/modules/cloud/google/gcp_compute_instance_template_info.py +++ b/lib/ansible/modules/cloud/google/gcp_compute_instance_template_info.py @@ -84,9 +84,9 @@ options: - This only alters the User Agent string for any API requests. type: str notes: -- for authentication, you can set service_account_file using the c(gcp_service_account_file) +- for authentication, you can set service_account_file using the C(gcp_service_account_file) env variable. -- for authentication, you can set service_account_contents using the c(GCP_SERVICE_ACCOUNT_CONTENTS) +- for authentication, you can set service_account_contents using the C(GCP_SERVICE_ACCOUNT_CONTENTS) env variable. - For authentication, you can set service_account_email using the C(GCP_SERVICE_ACCOUNT_EMAIL) env variable. diff --git a/lib/ansible/modules/cloud/google/gcp_compute_interconnect_attachment_info.py b/lib/ansible/modules/cloud/google/gcp_compute_interconnect_attachment_info.py index 0001879d734..819d95238a5 100644 --- a/lib/ansible/modules/cloud/google/gcp_compute_interconnect_attachment_info.py +++ b/lib/ansible/modules/cloud/google/gcp_compute_interconnect_attachment_info.py @@ -89,9 +89,9 @@ options: - This only alters the User Agent string for any API requests. type: str notes: -- for authentication, you can set service_account_file using the c(gcp_service_account_file) +- for authentication, you can set service_account_file using the C(gcp_service_account_file) env variable. -- for authentication, you can set service_account_contents using the c(GCP_SERVICE_ACCOUNT_CONTENTS) +- for authentication, you can set service_account_contents using the C(GCP_SERVICE_ACCOUNT_CONTENTS) env variable. - For authentication, you can set service_account_email using the C(GCP_SERVICE_ACCOUNT_EMAIL) env variable. diff --git a/lib/ansible/modules/cloud/google/gcp_compute_network.py b/lib/ansible/modules/cloud/google/gcp_compute_network.py index d7e776334f5..0cdb633f2bf 100644 --- a/lib/ansible/modules/cloud/google/gcp_compute_network.py +++ b/lib/ansible/modules/cloud/google/gcp_compute_network.py @@ -142,9 +142,9 @@ options: notes: - 'API Reference: U(https://cloud.google.com/compute/docs/reference/rest/v1/networks)' - 'Official Documentation: U(https://cloud.google.com/vpc/docs/vpc)' -- for authentication, you can set service_account_file using the c(gcp_service_account_file) +- for authentication, you can set service_account_file using the C(gcp_service_account_file) env variable. -- for authentication, you can set service_account_contents using the c(GCP_SERVICE_ACCOUNT_CONTENTS) +- for authentication, you can set service_account_contents using the C(GCP_SERVICE_ACCOUNT_CONTENTS) env variable. - For authentication, you can set service_account_email using the C(GCP_SERVICE_ACCOUNT_EMAIL) env variable. diff --git a/lib/ansible/modules/cloud/google/gcp_compute_network_endpoint_group.py b/lib/ansible/modules/cloud/google/gcp_compute_network_endpoint_group.py index 12e36d38e62..5c8c922ee20 100644 --- a/lib/ansible/modules/cloud/google/gcp_compute_network_endpoint_group.py +++ b/lib/ansible/modules/cloud/google/gcp_compute_network_endpoint_group.py @@ -150,9 +150,9 @@ options: notes: - 'API Reference: U(https://cloud.google.com/compute/docs/reference/rest/beta/networkEndpointGroups)' - 'Official Documentation: U(https://cloud.google.com/load-balancing/docs/negs/)' -- for authentication, you can set service_account_file using the c(gcp_service_account_file) +- for authentication, you can set service_account_file using the C(gcp_service_account_file) env variable. -- for authentication, you can set service_account_contents using the c(GCP_SERVICE_ACCOUNT_CONTENTS) +- for authentication, you can set service_account_contents using the C(GCP_SERVICE_ACCOUNT_CONTENTS) env variable. - For authentication, you can set service_account_email using the C(GCP_SERVICE_ACCOUNT_EMAIL) env variable. diff --git a/lib/ansible/modules/cloud/google/gcp_compute_network_endpoint_group_info.py b/lib/ansible/modules/cloud/google/gcp_compute_network_endpoint_group_info.py index 5cee94de367..17ac045ddf2 100644 --- a/lib/ansible/modules/cloud/google/gcp_compute_network_endpoint_group_info.py +++ b/lib/ansible/modules/cloud/google/gcp_compute_network_endpoint_group_info.py @@ -89,9 +89,9 @@ options: - This only alters the User Agent string for any API requests. type: str notes: -- for authentication, you can set service_account_file using the c(gcp_service_account_file) +- for authentication, you can set service_account_file using the C(gcp_service_account_file) env variable. -- for authentication, you can set service_account_contents using the c(GCP_SERVICE_ACCOUNT_CONTENTS) +- for authentication, you can set service_account_contents using the C(GCP_SERVICE_ACCOUNT_CONTENTS) env variable. - For authentication, you can set service_account_email using the C(GCP_SERVICE_ACCOUNT_EMAIL) env variable. diff --git a/lib/ansible/modules/cloud/google/gcp_compute_network_info.py b/lib/ansible/modules/cloud/google/gcp_compute_network_info.py index f35f0691bb4..8c20b345d7b 100644 --- a/lib/ansible/modules/cloud/google/gcp_compute_network_info.py +++ b/lib/ansible/modules/cloud/google/gcp_compute_network_info.py @@ -84,9 +84,9 @@ options: - This only alters the User Agent string for any API requests. type: str notes: -- for authentication, you can set service_account_file using the c(gcp_service_account_file) +- for authentication, you can set service_account_file using the C(gcp_service_account_file) env variable. -- for authentication, you can set service_account_contents using the c(GCP_SERVICE_ACCOUNT_CONTENTS) +- for authentication, you can set service_account_contents using the C(GCP_SERVICE_ACCOUNT_CONTENTS) env variable. - For authentication, you can set service_account_email using the C(GCP_SERVICE_ACCOUNT_EMAIL) env variable. diff --git a/lib/ansible/modules/cloud/google/gcp_compute_node_group.py b/lib/ansible/modules/cloud/google/gcp_compute_node_group.py index 415deca007a..c275d4c5d19 100644 --- a/lib/ansible/modules/cloud/google/gcp_compute_node_group.py +++ b/lib/ansible/modules/cloud/google/gcp_compute_node_group.py @@ -118,9 +118,9 @@ options: notes: - 'API Reference: U(https://cloud.google.com/compute/docs/reference/rest/v1/nodeGroups)' - 'Sole-Tenant Nodes: U(https://cloud.google.com/compute/docs/nodes/)' -- for authentication, you can set service_account_file using the c(gcp_service_account_file) +- for authentication, you can set service_account_file using the C(gcp_service_account_file) env variable. -- for authentication, you can set service_account_contents using the c(GCP_SERVICE_ACCOUNT_CONTENTS) +- for authentication, you can set service_account_contents using the C(GCP_SERVICE_ACCOUNT_CONTENTS) env variable. - For authentication, you can set service_account_email using the C(GCP_SERVICE_ACCOUNT_EMAIL) env variable. diff --git a/lib/ansible/modules/cloud/google/gcp_compute_node_group_info.py b/lib/ansible/modules/cloud/google/gcp_compute_node_group_info.py index 890a3999b59..f85939d2596 100644 --- a/lib/ansible/modules/cloud/google/gcp_compute_node_group_info.py +++ b/lib/ansible/modules/cloud/google/gcp_compute_node_group_info.py @@ -89,9 +89,9 @@ options: - This only alters the User Agent string for any API requests. type: str notes: -- for authentication, you can set service_account_file using the c(gcp_service_account_file) +- for authentication, you can set service_account_file using the C(gcp_service_account_file) env variable. -- for authentication, you can set service_account_contents using the c(GCP_SERVICE_ACCOUNT_CONTENTS) +- for authentication, you can set service_account_contents using the C(GCP_SERVICE_ACCOUNT_CONTENTS) env variable. - For authentication, you can set service_account_email using the C(GCP_SERVICE_ACCOUNT_EMAIL) env variable. diff --git a/lib/ansible/modules/cloud/google/gcp_compute_node_template.py b/lib/ansible/modules/cloud/google/gcp_compute_node_template.py index 1fa914d7d4f..3cb1ab78171 100644 --- a/lib/ansible/modules/cloud/google/gcp_compute_node_template.py +++ b/lib/ansible/modules/cloud/google/gcp_compute_node_template.py @@ -134,9 +134,9 @@ options: notes: - 'API Reference: U(https://cloud.google.com/compute/docs/reference/rest/v1/nodeTemplates)' - 'Sole-Tenant Nodes: U(https://cloud.google.com/compute/docs/nodes/)' -- for authentication, you can set service_account_file using the c(gcp_service_account_file) +- for authentication, you can set service_account_file using the C(gcp_service_account_file) env variable. -- for authentication, you can set service_account_contents using the c(GCP_SERVICE_ACCOUNT_CONTENTS) +- for authentication, you can set service_account_contents using the C(GCP_SERVICE_ACCOUNT_CONTENTS) env variable. - For authentication, you can set service_account_email using the C(GCP_SERVICE_ACCOUNT_EMAIL) env variable. diff --git a/lib/ansible/modules/cloud/google/gcp_compute_node_template_info.py b/lib/ansible/modules/cloud/google/gcp_compute_node_template_info.py index bf62e571097..c4ad2daefaf 100644 --- a/lib/ansible/modules/cloud/google/gcp_compute_node_template_info.py +++ b/lib/ansible/modules/cloud/google/gcp_compute_node_template_info.py @@ -89,9 +89,9 @@ options: - This only alters the User Agent string for any API requests. type: str notes: -- for authentication, you can set service_account_file using the c(gcp_service_account_file) +- for authentication, you can set service_account_file using the C(gcp_service_account_file) env variable. -- for authentication, you can set service_account_contents using the c(GCP_SERVICE_ACCOUNT_CONTENTS) +- for authentication, you can set service_account_contents using the C(GCP_SERVICE_ACCOUNT_CONTENTS) env variable. - For authentication, you can set service_account_email using the C(GCP_SERVICE_ACCOUNT_EMAIL) env variable. diff --git a/lib/ansible/modules/cloud/google/gcp_compute_region_backend_service.py b/lib/ansible/modules/cloud/google/gcp_compute_region_backend_service.py index 96b5ec2add2..3d513259e5c 100644 --- a/lib/ansible/modules/cloud/google/gcp_compute_region_backend_service.py +++ b/lib/ansible/modules/cloud/google/gcp_compute_region_backend_service.py @@ -181,9 +181,9 @@ options: notes: - 'API Reference: U(https://cloud.google.com/compute/docs/reference/latest/regionBackendServices)' - 'Internal TCP/UDP Load Balancing: U(https://cloud.google.com/compute/docs/load-balancing/internal/)' -- for authentication, you can set service_account_file using the c(gcp_service_account_file) +- for authentication, you can set service_account_file using the C(gcp_service_account_file) env variable. -- for authentication, you can set service_account_contents using the c(GCP_SERVICE_ACCOUNT_CONTENTS) +- for authentication, you can set service_account_contents using the C(GCP_SERVICE_ACCOUNT_CONTENTS) env variable. - For authentication, you can set service_account_email using the C(GCP_SERVICE_ACCOUNT_EMAIL) env variable. diff --git a/lib/ansible/modules/cloud/google/gcp_compute_region_backend_service_info.py b/lib/ansible/modules/cloud/google/gcp_compute_region_backend_service_info.py index bc3f6c1415f..e71f64c76bc 100644 --- a/lib/ansible/modules/cloud/google/gcp_compute_region_backend_service_info.py +++ b/lib/ansible/modules/cloud/google/gcp_compute_region_backend_service_info.py @@ -89,9 +89,9 @@ options: - This only alters the User Agent string for any API requests. type: str notes: -- for authentication, you can set service_account_file using the c(gcp_service_account_file) +- for authentication, you can set service_account_file using the C(gcp_service_account_file) env variable. -- for authentication, you can set service_account_contents using the c(GCP_SERVICE_ACCOUNT_CONTENTS) +- for authentication, you can set service_account_contents using the C(GCP_SERVICE_ACCOUNT_CONTENTS) env variable. - For authentication, you can set service_account_email using the C(GCP_SERVICE_ACCOUNT_EMAIL) env variable. diff --git a/lib/ansible/modules/cloud/google/gcp_compute_region_disk.py b/lib/ansible/modules/cloud/google/gcp_compute_region_disk.py index 434d48e20f1..45fd14d5269 100644 --- a/lib/ansible/modules/cloud/google/gcp_compute_region_disk.py +++ b/lib/ansible/modules/cloud/google/gcp_compute_region_disk.py @@ -202,9 +202,9 @@ options: notes: - 'API Reference: U(https://cloud.google.com/compute/docs/reference/rest/beta/regionDisks)' - 'Adding or Resizing Regional Persistent Disks: U(https://cloud.google.com/compute/docs/disks/regional-persistent-disk)' -- for authentication, you can set service_account_file using the c(gcp_service_account_file) +- for authentication, you can set service_account_file using the C(gcp_service_account_file) env variable. -- for authentication, you can set service_account_contents using the c(GCP_SERVICE_ACCOUNT_CONTENTS) +- for authentication, you can set service_account_contents using the C(GCP_SERVICE_ACCOUNT_CONTENTS) env variable. - For authentication, you can set service_account_email using the C(GCP_SERVICE_ACCOUNT_EMAIL) env variable. diff --git a/lib/ansible/modules/cloud/google/gcp_compute_region_disk_info.py b/lib/ansible/modules/cloud/google/gcp_compute_region_disk_info.py index 5fb534ba15a..e3112e274d7 100644 --- a/lib/ansible/modules/cloud/google/gcp_compute_region_disk_info.py +++ b/lib/ansible/modules/cloud/google/gcp_compute_region_disk_info.py @@ -89,9 +89,9 @@ options: - This only alters the User Agent string for any API requests. type: str notes: -- for authentication, you can set service_account_file using the c(gcp_service_account_file) +- for authentication, you can set service_account_file using the C(gcp_service_account_file) env variable. -- for authentication, you can set service_account_contents using the c(GCP_SERVICE_ACCOUNT_CONTENTS) +- for authentication, you can set service_account_contents using the C(GCP_SERVICE_ACCOUNT_CONTENTS) env variable. - For authentication, you can set service_account_email using the C(GCP_SERVICE_ACCOUNT_EMAIL) env variable. diff --git a/lib/ansible/modules/cloud/google/gcp_compute_route.py b/lib/ansible/modules/cloud/google/gcp_compute_route.py index 9e62c64d4d3..fbe8fda5ed4 100644 --- a/lib/ansible/modules/cloud/google/gcp_compute_route.py +++ b/lib/ansible/modules/cloud/google/gcp_compute_route.py @@ -187,9 +187,9 @@ options: notes: - 'API Reference: U(https://cloud.google.com/compute/docs/reference/rest/v1/routes)' - 'Using Routes: U(https://cloud.google.com/vpc/docs/using-routes)' -- for authentication, you can set service_account_file using the c(gcp_service_account_file) +- for authentication, you can set service_account_file using the C(gcp_service_account_file) env variable. -- for authentication, you can set service_account_contents using the c(GCP_SERVICE_ACCOUNT_CONTENTS) +- for authentication, you can set service_account_contents using the C(GCP_SERVICE_ACCOUNT_CONTENTS) env variable. - For authentication, you can set service_account_email using the C(GCP_SERVICE_ACCOUNT_EMAIL) env variable. diff --git a/lib/ansible/modules/cloud/google/gcp_compute_route_info.py b/lib/ansible/modules/cloud/google/gcp_compute_route_info.py index c14666832db..6872ea4e9ab 100644 --- a/lib/ansible/modules/cloud/google/gcp_compute_route_info.py +++ b/lib/ansible/modules/cloud/google/gcp_compute_route_info.py @@ -84,9 +84,9 @@ options: - This only alters the User Agent string for any API requests. type: str notes: -- for authentication, you can set service_account_file using the c(gcp_service_account_file) +- for authentication, you can set service_account_file using the C(gcp_service_account_file) env variable. -- for authentication, you can set service_account_contents using the c(GCP_SERVICE_ACCOUNT_CONTENTS) +- for authentication, you can set service_account_contents using the C(GCP_SERVICE_ACCOUNT_CONTENTS) env variable. - For authentication, you can set service_account_email using the C(GCP_SERVICE_ACCOUNT_EMAIL) env variable. diff --git a/lib/ansible/modules/cloud/google/gcp_compute_router.py b/lib/ansible/modules/cloud/google/gcp_compute_router.py index adbb7c7de8d..a42f623bd52 100644 --- a/lib/ansible/modules/cloud/google/gcp_compute_router.py +++ b/lib/ansible/modules/cloud/google/gcp_compute_router.py @@ -168,9 +168,9 @@ options: notes: - 'API Reference: U(https://cloud.google.com/compute/docs/reference/rest/v1/routers)' - 'Google Cloud Router: U(https://cloud.google.com/router/docs/)' -- for authentication, you can set service_account_file using the c(gcp_service_account_file) +- for authentication, you can set service_account_file using the C(gcp_service_account_file) env variable. -- for authentication, you can set service_account_contents using the c(GCP_SERVICE_ACCOUNT_CONTENTS) +- for authentication, you can set service_account_contents using the C(GCP_SERVICE_ACCOUNT_CONTENTS) env variable. - For authentication, you can set service_account_email using the C(GCP_SERVICE_ACCOUNT_EMAIL) env variable. diff --git a/lib/ansible/modules/cloud/google/gcp_compute_router_info.py b/lib/ansible/modules/cloud/google/gcp_compute_router_info.py index 0291c02b3e1..83167c45ab4 100644 --- a/lib/ansible/modules/cloud/google/gcp_compute_router_info.py +++ b/lib/ansible/modules/cloud/google/gcp_compute_router_info.py @@ -89,9 +89,9 @@ options: - This only alters the User Agent string for any API requests. type: str notes: -- for authentication, you can set service_account_file using the c(gcp_service_account_file) +- for authentication, you can set service_account_file using the C(gcp_service_account_file) env variable. -- for authentication, you can set service_account_contents using the c(GCP_SERVICE_ACCOUNT_CONTENTS) +- for authentication, you can set service_account_contents using the C(GCP_SERVICE_ACCOUNT_CONTENTS) env variable. - For authentication, you can set service_account_email using the C(GCP_SERVICE_ACCOUNT_EMAIL) env variable. diff --git a/lib/ansible/modules/cloud/google/gcp_compute_snapshot.py b/lib/ansible/modules/cloud/google/gcp_compute_snapshot.py index 67aed3ebd46..2c8ff31e241 100644 --- a/lib/ansible/modules/cloud/google/gcp_compute_snapshot.py +++ b/lib/ansible/modules/cloud/google/gcp_compute_snapshot.py @@ -167,9 +167,9 @@ options: notes: - 'API Reference: U(https://cloud.google.com/compute/docs/reference/rest/v1/snapshots)' - 'Official Documentation: U(https://cloud.google.com/compute/docs/disks/create-snapshots)' -- for authentication, you can set service_account_file using the c(gcp_service_account_file) +- for authentication, you can set service_account_file using the C(gcp_service_account_file) env variable. -- for authentication, you can set service_account_contents using the c(GCP_SERVICE_ACCOUNT_CONTENTS) +- for authentication, you can set service_account_contents using the C(GCP_SERVICE_ACCOUNT_CONTENTS) env variable. - For authentication, you can set service_account_email using the C(GCP_SERVICE_ACCOUNT_EMAIL) env variable. diff --git a/lib/ansible/modules/cloud/google/gcp_compute_snapshot_info.py b/lib/ansible/modules/cloud/google/gcp_compute_snapshot_info.py index e11e664f68a..01033ef3df7 100644 --- a/lib/ansible/modules/cloud/google/gcp_compute_snapshot_info.py +++ b/lib/ansible/modules/cloud/google/gcp_compute_snapshot_info.py @@ -84,9 +84,9 @@ options: - This only alters the User Agent string for any API requests. type: str notes: -- for authentication, you can set service_account_file using the c(gcp_service_account_file) +- for authentication, you can set service_account_file using the C(gcp_service_account_file) env variable. -- for authentication, you can set service_account_contents using the c(GCP_SERVICE_ACCOUNT_CONTENTS) +- for authentication, you can set service_account_contents using the C(GCP_SERVICE_ACCOUNT_CONTENTS) env variable. - For authentication, you can set service_account_email using the C(GCP_SERVICE_ACCOUNT_EMAIL) env variable. diff --git a/lib/ansible/modules/cloud/google/gcp_compute_ssl_certificate.py b/lib/ansible/modules/cloud/google/gcp_compute_ssl_certificate.py index ac6bd946c6c..e0f1ff7a6ae 100644 --- a/lib/ansible/modules/cloud/google/gcp_compute_ssl_certificate.py +++ b/lib/ansible/modules/cloud/google/gcp_compute_ssl_certificate.py @@ -117,9 +117,9 @@ options: notes: - 'API Reference: U(https://cloud.google.com/compute/docs/reference/rest/v1/sslCertificates)' - 'Official Documentation: U(https://cloud.google.com/load-balancing/docs/ssl-certificates)' -- for authentication, you can set service_account_file using the c(gcp_service_account_file) +- for authentication, you can set service_account_file using the C(gcp_service_account_file) env variable. -- for authentication, you can set service_account_contents using the c(GCP_SERVICE_ACCOUNT_CONTENTS) +- for authentication, you can set service_account_contents using the C(GCP_SERVICE_ACCOUNT_CONTENTS) env variable. - For authentication, you can set service_account_email using the C(GCP_SERVICE_ACCOUNT_EMAIL) env variable.