mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
Bug fixes for GCP modules (#54574)
This commit is contained in:
parent
8fed391461
commit
acaf91d5f0
2 changed files with 52 additions and 0 deletions
|
@ -206,6 +206,18 @@ options:
|
||||||
choices:
|
choices:
|
||||||
- PREMIUM
|
- PREMIUM
|
||||||
- STANDARD
|
- STANDARD
|
||||||
|
service_label:
|
||||||
|
description:
|
||||||
|
- An optional prefix to the service name for this Forwarding Rule.
|
||||||
|
- If specified, will be the first label of the fully qualified service name.
|
||||||
|
- The label must be 1-63 characters long, and comply with RFC1035.
|
||||||
|
- Specifically, the label must be 1-63 characters long and match the regular expression
|
||||||
|
`[a-z]([-a-z0-9]*[a-z0-9])?` which means the first character must be a lowercase
|
||||||
|
letter, and all following characters must be a dash, lowercase letter, or digit,
|
||||||
|
except the last character, which cannot be a dash.
|
||||||
|
- This field is only used for internal load balancing.
|
||||||
|
required: false
|
||||||
|
version_added: 2.8
|
||||||
region:
|
region:
|
||||||
description:
|
description:
|
||||||
- A reference to the region where the regional forwarding rule resides.
|
- A reference to the region where the regional forwarding rule resides.
|
||||||
|
@ -396,6 +408,24 @@ networkTier:
|
||||||
to be PREMIUM.'
|
to be PREMIUM.'
|
||||||
returned: success
|
returned: success
|
||||||
type: str
|
type: str
|
||||||
|
serviceLabel:
|
||||||
|
description:
|
||||||
|
- An optional prefix to the service name for this Forwarding Rule.
|
||||||
|
- If specified, will be the first label of the fully qualified service name.
|
||||||
|
- The label must be 1-63 characters long, and comply with RFC1035.
|
||||||
|
- Specifically, the label must be 1-63 characters long and match the regular expression
|
||||||
|
`[a-z]([-a-z0-9]*[a-z0-9])?` which means the first character must be a lowercase
|
||||||
|
letter, and all following characters must be a dash, lowercase letter, or digit,
|
||||||
|
except the last character, which cannot be a dash.
|
||||||
|
- This field is only used for internal load balancing.
|
||||||
|
returned: success
|
||||||
|
type: str
|
||||||
|
serviceName:
|
||||||
|
description:
|
||||||
|
- The internal fully qualified service name for this Forwarding Rule.
|
||||||
|
- This field is only used for internal load balancing.
|
||||||
|
returned: success
|
||||||
|
type: str
|
||||||
region:
|
region:
|
||||||
description:
|
description:
|
||||||
- A reference to the region where the regional forwarding rule resides.
|
- A reference to the region where the regional forwarding rule resides.
|
||||||
|
@ -437,6 +467,7 @@ def main():
|
||||||
target=dict(),
|
target=dict(),
|
||||||
all_ports=dict(type='bool'),
|
all_ports=dict(type='bool'),
|
||||||
network_tier=dict(type='str', choices=['PREMIUM', 'STANDARD']),
|
network_tier=dict(type='str', choices=['PREMIUM', 'STANDARD']),
|
||||||
|
service_label=dict(type='str'),
|
||||||
region=dict(required=True, type='str'),
|
region=dict(required=True, type='str'),
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
@ -517,6 +548,7 @@ def resource_to_request(module):
|
||||||
u'target': replace_resource_dict(module.params.get(u'target', {}), 'selfLink'),
|
u'target': replace_resource_dict(module.params.get(u'target', {}), 'selfLink'),
|
||||||
u'allPorts': module.params.get('all_ports'),
|
u'allPorts': module.params.get('all_ports'),
|
||||||
u'networkTier': module.params.get('network_tier'),
|
u'networkTier': module.params.get('network_tier'),
|
||||||
|
u'serviceLabel': module.params.get('service_label'),
|
||||||
}
|
}
|
||||||
return_vals = {}
|
return_vals = {}
|
||||||
for k, v in request.items():
|
for k, v in request.items():
|
||||||
|
@ -598,6 +630,8 @@ def response_to_hash(module, response):
|
||||||
u'target': response.get(u'target'),
|
u'target': response.get(u'target'),
|
||||||
u'allPorts': response.get(u'allPorts'),
|
u'allPorts': response.get(u'allPorts'),
|
||||||
u'networkTier': module.params.get('network_tier'),
|
u'networkTier': module.params.get('network_tier'),
|
||||||
|
u'serviceLabel': response.get(u'serviceLabel'),
|
||||||
|
u'serviceName': response.get(u'serviceName'),
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -216,6 +216,24 @@ items:
|
||||||
it is assumed to be PREMIUM.'
|
it is assumed to be PREMIUM.'
|
||||||
returned: success
|
returned: success
|
||||||
type: str
|
type: str
|
||||||
|
serviceLabel:
|
||||||
|
description:
|
||||||
|
- An optional prefix to the service name for this Forwarding Rule.
|
||||||
|
- If specified, will be the first label of the fully qualified service name.
|
||||||
|
- The label must be 1-63 characters long, and comply with RFC1035.
|
||||||
|
- Specifically, the label must be 1-63 characters long and match the regular
|
||||||
|
expression `[a-z]([-a-z0-9]*[a-z0-9])?` which means the first character must
|
||||||
|
be a lowercase letter, and all following characters must be a dash, lowercase
|
||||||
|
letter, or digit, except the last character, which cannot be a dash.
|
||||||
|
- This field is only used for internal load balancing.
|
||||||
|
returned: success
|
||||||
|
type: str
|
||||||
|
serviceName:
|
||||||
|
description:
|
||||||
|
- The internal fully qualified service name for this Forwarding Rule.
|
||||||
|
- This field is only used for internal load balancing.
|
||||||
|
returned: success
|
||||||
|
type: str
|
||||||
region:
|
region:
|
||||||
description:
|
description:
|
||||||
- A reference to the region where the regional forwarding rule resides.
|
- A reference to the region where the regional forwarding rule resides.
|
||||||
|
|
Loading…
Reference in a new issue