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

Bug fixes for GCP modules (#60667)

Browse source
This commit is contained in:
The Magician 2019-08-16 12:23:48 -07:00 committed by ansibot
parent 818d1b2e45
commit 8d33e9ae4d
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/ansible/modules/cloud/google/gcp_pubsub_topic.py
View file

@ -56,7 +56,7 @@ options:
kms_key_name:
description:
- The resource name of the Cloud KMS CryptoKey to be used to protect access to
messsages published on this topic. Your project's PubSub service account (`service-{{PROJECT_NUMBER}}@gcp-sa-pubsub.iam.gserviceaccount.com`)
messages published on this topic. Your project's PubSub service account (`service-{{PROJECT_NUMBER}}@gcp-sa-pubsub.iam.gserviceaccount.com`)
must have `roles/cloudkms.cryptoKeyEncrypterDecrypter` to use this feature.
- The expected format is `projects/*/locations/*/keyRings/*/cryptoKeys/*` .
required: false
@ -110,7 +110,7 @@ name:
type: str
kmsKeyName:
description:
- The resource name of the Cloud KMS CryptoKey to be used to protect access to messsages
- The resource name of the Cloud KMS CryptoKey to be used to protect access to messages
published on this topic. Your project's PubSub service account (`service-{{PROJECT_NUMBER}}@gcp-sa-pubsub.iam.gserviceaccount.com`)
must have `roles/cloudkms.cryptoKeyEncrypterDecrypter` to use this feature.
- The expected format is `projects/*/locations/*/keyRings/*/cryptoKeys/*` .

2
lib/ansible/modules/cloud/google/gcp_pubsub_topic_info.py
View file

@ -67,7 +67,7 @@ resources:
kmsKeyName:
description:
- The resource name of the Cloud KMS CryptoKey to be used to protect access
to messsages published on this topic. Your project's PubSub service account
to messages published on this topic. Your project's PubSub service account
(`service-{{PROJECT_NUMBER}}@gcp-sa-pubsub.iam.gserviceaccount.com`) must
have `roles/cloudkms.cryptoKeyEncrypterDecrypter` to use this feature.
- The expected format is `projects/*/locations/*/keyRings/*/cryptoKeys/*` .

4
lib/ansible/modules/cloud/google/gcp_sql_instance.py
View file

@ -175,7 +175,7 @@ options:
- Path to a SQL dump file in Google Cloud Storage from which the slave
instance is to be created. The URI is in the form gs://bucketName/fileName.
Compressed gzip files (.gz) are also supported. Dumps should have the
binlog co-ordinates from which replication should begin. This can be
binlog coordinates from which replication should begin. This can be
accomplished by setting --master-data to 1 when using mysqldump.
required: false
type: str
@ -495,7 +495,7 @@ replicaConfiguration:
description:
- Path to a SQL dump file in Google Cloud Storage from which the slave instance
is to be created. The URI is in the form gs://bucketName/fileName. Compressed
gzip files (.gz) are also supported. Dumps should have the binlog co-ordinates
gzip files (.gz) are also supported. Dumps should have the binlog coordinates
from which replication should begin. This can be accomplished by setting
--master-data to 1 when using mysqldump.
returned: success

4
lib/ansible/modules/cloud/google/gcp_sql_instance_info.py
View file

@ -215,8 +215,8 @@ resources:
- Path to a SQL dump file in Google Cloud Storage from which the slave
instance is to be created. The URI is in the form gs://bucketName/fileName.
Compressed gzip files (.gz) are also supported. Dumps should have
the binlog co-ordinates from which replication should begin. This
can be accomplished by setting --master-data to 1 when using mysqldump.
the binlog coordinates from which replication should begin. This can
be accomplished by setting --master-data to 1 when using mysqldump.
returned: success
type: str
masterHeartbeatPeriod: