mirror of
https://github.com/ansible-collections/community.general.git
synced 2025-07-28 07:31:23 -07:00
Bug fixes for GCP modules (as of 2019-01-09T15:35:45-08:00) (#50786)
This commit is contained in:
parent
a7e81ba500
commit
5137bd5958
18 changed files with 142 additions and 119 deletions
|
@ -67,7 +67,7 @@ items:
|
|||
description:
|
||||
- A reference to a Topic resource.
|
||||
returned: success
|
||||
type: dict
|
||||
type: str
|
||||
pushConfig:
|
||||
description:
|
||||
- If push delivery is used with this subscription, this field is used to configure
|
||||
|
|
|
@ -65,10 +65,9 @@ options:
|
|||
description:
|
||||
- The instance to create the database on.
|
||||
- 'This field represents a link to a Instance resource in GCP. It can be specified
|
||||
in two ways. You can add `register: name-of-resource` to a gcp_spanner_instance
|
||||
task and then set this instance field to "{{ name-of-resource }}" Alternatively,
|
||||
you can set this instance to a dictionary with the name key where the value
|
||||
is the name of your Instance'
|
||||
in two ways. First, you can place in the name of the resource here as a string
|
||||
Alternatively, you can add `register: name-of-resource` to a gcp_spanner_instance
|
||||
task and then set this instance field to "{{ name-of-resource }}"'
|
||||
required: true
|
||||
extends_documentation_fragment: gcp
|
||||
'''
|
||||
|
@ -118,7 +117,7 @@ instance:
|
|||
description:
|
||||
- The instance to create the database on.
|
||||
returned: success
|
||||
type: dict
|
||||
type: str
|
||||
'''
|
||||
|
||||
################################################################################
|
||||
|
@ -141,7 +140,7 @@ def main():
|
|||
state=dict(default='present', choices=['present', 'absent'], type='str'),
|
||||
name=dict(type='str'),
|
||||
extra_statements=dict(type='list', elements='str'),
|
||||
instance=dict(required=True, type='dict')
|
||||
instance=dict(required=True)
|
||||
)
|
||||
)
|
||||
|
||||
|
|
|
@ -45,10 +45,9 @@ options:
|
|||
description:
|
||||
- The instance to create the database on.
|
||||
- 'This field represents a link to a Instance resource in GCP. It can be specified
|
||||
in two ways. You can add `register: name-of-resource` to a gcp_spanner_instance
|
||||
task and then set this instance field to "{{ name-of-resource }}" Alternatively,
|
||||
you can set this instance to a dictionary with the name key where the value
|
||||
is the name of your Instance'
|
||||
in two ways. First, you can place in the name of the resource here as a string
|
||||
Alternatively, you can add `register: name-of-resource` to a gcp_spanner_instance
|
||||
task and then set this instance field to "{{ name-of-resource }}"'
|
||||
required: true
|
||||
extends_documentation_fragment: gcp
|
||||
'''
|
||||
|
@ -87,7 +86,7 @@ items:
|
|||
description:
|
||||
- The instance to create the database on.
|
||||
returned: success
|
||||
type: dict
|
||||
type: str
|
||||
'''
|
||||
|
||||
################################################################################
|
||||
|
@ -104,7 +103,7 @@ import json
|
|||
def main():
|
||||
module = GcpModule(
|
||||
argument_spec=dict(
|
||||
instance=dict(required=True, type='dict')
|
||||
instance=dict(required=True)
|
||||
)
|
||||
)
|
||||
|
||||
|
|
|
@ -65,10 +65,9 @@ options:
|
|||
description:
|
||||
- The name of the Cloud SQL instance. This does not include the project ID.
|
||||
- 'This field represents a link to a Instance resource in GCP. It can be specified
|
||||
in two ways. You can add `register: name-of-resource` to a gcp_sql_instance
|
||||
task and then set this instance field to "{{ name-of-resource }}" Alternatively,
|
||||
you can set this instance to a dictionary with the name key where the value
|
||||
is the name of your Instance'
|
||||
in two ways. First, you can place in the name of the resource here as a string
|
||||
Alternatively, you can add `register: name-of-resource` to a gcp_sql_instance
|
||||
task and then set this instance field to "{{ name-of-resource }}"'
|
||||
required: true
|
||||
extends_documentation_fragment: gcp
|
||||
'''
|
||||
|
@ -76,7 +75,7 @@ extends_documentation_fragment: gcp
|
|||
EXAMPLES = '''
|
||||
- name: create a instance
|
||||
gcp_sql_instance:
|
||||
name: "instance-database"
|
||||
name: "{{resource_name}}-3"
|
||||
settings:
|
||||
ip_configuration:
|
||||
authorized_networks:
|
||||
|
@ -122,7 +121,7 @@ instance:
|
|||
description:
|
||||
- The name of the Cloud SQL instance. This does not include the project ID.
|
||||
returned: success
|
||||
type: dict
|
||||
type: str
|
||||
'''
|
||||
|
||||
################################################################################
|
||||
|
@ -147,7 +146,7 @@ def main():
|
|||
charset=dict(type='str'),
|
||||
collation=dict(type='str'),
|
||||
name=dict(type='str'),
|
||||
instance=dict(required=True, type='dict')
|
||||
instance=dict(required=True)
|
||||
)
|
||||
)
|
||||
|
||||
|
|
|
@ -45,10 +45,9 @@ options:
|
|||
description:
|
||||
- The name of the Cloud SQL instance. This does not include the project ID.
|
||||
- 'This field represents a link to a Instance resource in GCP. It can be specified
|
||||
in two ways. You can add `register: name-of-resource` to a gcp_sql_instance
|
||||
task and then set this instance field to "{{ name-of-resource }}" Alternatively,
|
||||
you can set this instance to a dictionary with the name key where the value
|
||||
is the name of your Instance'
|
||||
in two ways. First, you can place in the name of the resource here as a string
|
||||
Alternatively, you can add `register: name-of-resource` to a gcp_sql_instance
|
||||
task and then set this instance field to "{{ name-of-resource }}"'
|
||||
required: true
|
||||
extends_documentation_fragment: gcp
|
||||
'''
|
||||
|
@ -88,7 +87,7 @@ items:
|
|||
description:
|
||||
- The name of the Cloud SQL instance. This does not include the project ID.
|
||||
returned: success
|
||||
type: dict
|
||||
type: str
|
||||
'''
|
||||
|
||||
################################################################################
|
||||
|
@ -105,7 +104,7 @@ import json
|
|||
def main():
|
||||
module = GcpModule(
|
||||
argument_spec=dict(
|
||||
instance=dict(required=True, type='dict')
|
||||
instance=dict(required=True)
|
||||
)
|
||||
)
|
||||
|
||||
|
|
|
@ -87,7 +87,7 @@ options:
|
|||
description:
|
||||
- The availability status of the failover replica. A false status indicates
|
||||
that the failover replica is out of sync. The master can only failover to
|
||||
the falover replica when the status is true.
|
||||
the failover replica when the status is true.
|
||||
required: false
|
||||
type: bool
|
||||
name:
|
||||
|
@ -163,8 +163,8 @@ options:
|
|||
required: false
|
||||
client_key:
|
||||
description:
|
||||
- PEM representation of the slave's private key. The corresponsing public
|
||||
key is encoded in the client's asf asd certificate.
|
||||
- PEM representation of the slave's private key. The corresponding public
|
||||
key is encoded in the client's certificate.
|
||||
required: false
|
||||
connect_retry_interval:
|
||||
description:
|
||||
|
@ -273,7 +273,7 @@ extends_documentation_fragment: gcp
|
|||
EXAMPLES = '''
|
||||
- name: create a instance
|
||||
gcp_sql_instance:
|
||||
name: "test_object"
|
||||
name: "{{resource_name}}-2"
|
||||
settings:
|
||||
ip_configuration:
|
||||
authorized_networks:
|
||||
|
@ -320,7 +320,7 @@ failoverReplica:
|
|||
description:
|
||||
- The availability status of the failover replica. A false status indicates
|
||||
that the failover replica is out of sync. The master can only failover to
|
||||
the falover replica when the status is true.
|
||||
the failover replica when the status is true.
|
||||
returned: success
|
||||
type: bool
|
||||
name:
|
||||
|
@ -427,8 +427,8 @@ replicaConfiguration:
|
|||
type: str
|
||||
clientKey:
|
||||
description:
|
||||
- PEM representation of the slave's private key. The corresponsing public
|
||||
key is encoded in the client's asf asd certificate.
|
||||
- PEM representation of the slave's private key. The corresponding public
|
||||
key is encoded in the client's certificate.
|
||||
returned: success
|
||||
type: str
|
||||
connectRetryInterval:
|
||||
|
|
|
@ -90,7 +90,7 @@ items:
|
|||
description:
|
||||
- The availability status of the failover replica. A false status indicates
|
||||
that the failover replica is out of sync. The master can only failover
|
||||
to the falover replica when the status is true.
|
||||
to the failover replica when the status is true.
|
||||
returned: success
|
||||
type: bool
|
||||
name:
|
||||
|
@ -200,8 +200,8 @@ items:
|
|||
type: str
|
||||
clientKey:
|
||||
description:
|
||||
- PEM representation of the slave's private key. The corresponsing public
|
||||
key is encoded in the client's asf asd certificate.
|
||||
- PEM representation of the slave's private key. The corresponding public
|
||||
key is encoded in the client's certificate.
|
||||
returned: success
|
||||
type: str
|
||||
connectRetryInterval:
|
||||
|
|
|
@ -62,10 +62,9 @@ options:
|
|||
description:
|
||||
- The name of the Cloud SQL instance. This does not include the project ID.
|
||||
- 'This field represents a link to a Instance resource in GCP. It can be specified
|
||||
in two ways. You can add `register: name-of-resource` to a gcp_sql_instance
|
||||
task and then set this instance field to "{{ name-of-resource }}" Alternatively,
|
||||
you can set this instance to a dictionary with the name key where the value
|
||||
is the name of your Instance'
|
||||
in two ways. First, you can place in the name of the resource here as a string
|
||||
Alternatively, you can add `register: name-of-resource` to a gcp_sql_instance
|
||||
task and then set this instance field to "{{ name-of-resource }}"'
|
||||
required: true
|
||||
password:
|
||||
description:
|
||||
|
@ -77,7 +76,7 @@ extends_documentation_fragment: gcp
|
|||
EXAMPLES = '''
|
||||
- name: create a instance
|
||||
gcp_sql_instance:
|
||||
name: "instance-user"
|
||||
name: "{{resource_name}}-1"
|
||||
settings:
|
||||
ip_configuration:
|
||||
authorized_networks:
|
||||
|
@ -120,7 +119,7 @@ instance:
|
|||
description:
|
||||
- The name of the Cloud SQL instance. This does not include the project ID.
|
||||
returned: success
|
||||
type: dict
|
||||
type: str
|
||||
password:
|
||||
description:
|
||||
- The password for the user.
|
||||
|
@ -149,7 +148,7 @@ def main():
|
|||
state=dict(default='present', choices=['present', 'absent'], type='str'),
|
||||
host=dict(required=True, type='str'),
|
||||
name=dict(required=True, type='str'),
|
||||
instance=dict(required=True, type='dict'),
|
||||
instance=dict(required=True),
|
||||
password=dict(type='str')
|
||||
)
|
||||
)
|
||||
|
|
|
@ -45,10 +45,9 @@ options:
|
|||
description:
|
||||
- The name of the Cloud SQL instance. This does not include the project ID.
|
||||
- 'This field represents a link to a Instance resource in GCP. It can be specified
|
||||
in two ways. You can add `register: name-of-resource` to a gcp_sql_instance
|
||||
task and then set this instance field to "{{ name-of-resource }}" Alternatively,
|
||||
you can set this instance to a dictionary with the name key where the value
|
||||
is the name of your Instance'
|
||||
in two ways. First, you can place in the name of the resource here as a string
|
||||
Alternatively, you can add `register: name-of-resource` to a gcp_sql_instance
|
||||
task and then set this instance field to "{{ name-of-resource }}"'
|
||||
required: true
|
||||
extends_documentation_fragment: gcp
|
||||
'''
|
||||
|
@ -84,7 +83,7 @@ items:
|
|||
description:
|
||||
- The name of the Cloud SQL instance. This does not include the project ID.
|
||||
returned: success
|
||||
type: dict
|
||||
type: str
|
||||
password:
|
||||
description:
|
||||
- The password for the user.
|
||||
|
@ -106,7 +105,7 @@ import json
|
|||
def main():
|
||||
module = GcpModule(
|
||||
argument_spec=dict(
|
||||
instance=dict(required=True, type='dict')
|
||||
instance=dict(required=True)
|
||||
)
|
||||
)
|
||||
|
||||
|
|
|
@ -62,10 +62,9 @@ options:
|
|||
description:
|
||||
- The name of the bucket.
|
||||
- 'This field represents a link to a Bucket resource in GCP. It can be specified
|
||||
in two ways. You can add `register: name-of-resource` to a gcp_storage_bucket
|
||||
task and then set this bucket field to "{{ name-of-resource }}" Alternatively,
|
||||
you can set this bucket to a dictionary with the name key where the value
|
||||
is the name of your Bucket'
|
||||
in two ways. First, you can place in the name of the resource here as a
|
||||
string Alternatively, you can add `register: name-of-resource` to a gcp_storage_bucket
|
||||
task and then set this bucket field to "{{ name-of-resource }}"'
|
||||
required: true
|
||||
domain:
|
||||
description:
|
||||
|
@ -154,10 +153,9 @@ options:
|
|||
description:
|
||||
- The name of the bucket.
|
||||
- 'This field represents a link to a Bucket resource in GCP. It can be specified
|
||||
in two ways. You can add `register: name-of-resource` to a gcp_storage_bucket
|
||||
task and then set this bucket field to "{{ name-of-resource }}" Alternatively,
|
||||
you can set this bucket to a dictionary with the name key where the value
|
||||
is the name of your Bucket'
|
||||
in two ways. First, you can place in the name of the resource here as a
|
||||
string Alternatively, you can add `register: name-of-resource` to a gcp_storage_bucket
|
||||
task and then set this bucket field to "{{ name-of-resource }}"'
|
||||
required: true
|
||||
domain:
|
||||
description:
|
||||
|
@ -415,7 +413,7 @@ acl:
|
|||
description:
|
||||
- The name of the bucket.
|
||||
returned: success
|
||||
type: dict
|
||||
type: str
|
||||
domain:
|
||||
description:
|
||||
- The domain associated with the entity.
|
||||
|
@ -509,7 +507,7 @@ defaultObjectAcl:
|
|||
description:
|
||||
- The name of the bucket.
|
||||
returned: success
|
||||
type: dict
|
||||
type: str
|
||||
domain:
|
||||
description:
|
||||
- The domain associated with the entity.
|
||||
|
@ -793,7 +791,7 @@ def main():
|
|||
argument_spec=dict(
|
||||
state=dict(default='present', choices=['present', 'absent'], type='str'),
|
||||
acl=dict(type='list', elements='dict', options=dict(
|
||||
bucket=dict(required=True, type='dict'),
|
||||
bucket=dict(required=True),
|
||||
domain=dict(type='str'),
|
||||
email=dict(type='str'),
|
||||
entity=dict(required=True, type='str'),
|
||||
|
@ -812,7 +810,7 @@ def main():
|
|||
response_header=dict(type='list', elements='str')
|
||||
)),
|
||||
default_object_acl=dict(type='list', elements='dict', options=dict(
|
||||
bucket=dict(required=True, type='dict'),
|
||||
bucket=dict(required=True),
|
||||
domain=dict(type='str'),
|
||||
email=dict(type='str'),
|
||||
entity=dict(required=True, type='str'),
|
||||
|
|
|
@ -61,10 +61,9 @@ options:
|
|||
description:
|
||||
- The name of the bucket.
|
||||
- 'This field represents a link to a Bucket resource in GCP. It can be specified
|
||||
in two ways. You can add `register: name-of-resource` to a gcp_storage_bucket
|
||||
task and then set this bucket field to "{{ name-of-resource }}" Alternatively,
|
||||
you can set this bucket to a dictionary with the name key where the value is
|
||||
the name of your Bucket'
|
||||
in two ways. First, you can place in the name of the resource here as a string
|
||||
Alternatively, you can add `register: name-of-resource` to a gcp_storage_bucket
|
||||
task and then set this bucket field to "{{ name-of-resource }}"'
|
||||
required: true
|
||||
entity:
|
||||
description:
|
||||
|
@ -110,7 +109,7 @@ extends_documentation_fragment: gcp
|
|||
EXAMPLES = '''
|
||||
- name: create a bucket
|
||||
gcp_storage_bucket:
|
||||
name: "bucket-bac"
|
||||
name: "{{ resource_name }}"
|
||||
project: "{{ gcp_project }}"
|
||||
auth_kind: "{{ gcp_cred_kind }}"
|
||||
service_account_file: "{{ gcp_cred_file }}"
|
||||
|
@ -133,7 +132,7 @@ bucket:
|
|||
description:
|
||||
- The name of the bucket.
|
||||
returned: success
|
||||
type: dict
|
||||
type: str
|
||||
domain:
|
||||
description:
|
||||
- The domain associated with the entity.
|
||||
|
@ -205,7 +204,7 @@ def main():
|
|||
module = GcpModule(
|
||||
argument_spec=dict(
|
||||
state=dict(default='present', choices=['present', 'absent'], type='str'),
|
||||
bucket=dict(required=True, type='dict'),
|
||||
bucket=dict(required=True),
|
||||
entity=dict(required=True, type='str'),
|
||||
entity_id=dict(type='str'),
|
||||
project_team=dict(type='dict', options=dict(
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue