Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bug fixes for GCP (as of 2019-07-09T06:06:53Z) #59322

Merged
merged 2 commits into from
Jul 23, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
- present
- absent
default: present
type: str
description:
description:
- An optional description of this resource. Provide this property when you create
Expand Down
121 changes: 121 additions & 0 deletions lib/ansible/modules/cloud/google/gcp_compute_health_check.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
- present
- absent
default: present
type: str
check_interval_sec:
description:
- How often (in seconds) to send a health check. The default value is 5 seconds.
Expand Down Expand Up @@ -156,6 +157,21 @@
required: false
default: NONE
type: str
port_specification:
description:
- 'Specifies how port is selected for health checking, can be one of the following
values: * `USE_FIXED_PORT`: The port number in `port` is used for health
checking.'
- "* `USE_NAMED_PORT`: The `portName` is used for health checking."
- "* `USE_SERVING_PORT`: For NetworkEndpointGroup, the port specified for
each network endpoint is used for health checking. For other backends, the
port or named port specified in the Backend Service is used for health checking."
- If not specified, HTTP health check follows behavior specified in `port`
and `portName` fields.
- 'Some valid choices include: "USE_FIXED_PORT", "USE_NAMED_PORT", "USE_SERVING_PORT"'
required: false
type: str
version_added: 2.9
https_health_check:
description:
- A nested object resource.
Expand Down Expand Up @@ -203,6 +219,21 @@
required: false
default: NONE
type: str
port_specification:
description:
- 'Specifies how port is selected for health checking, can be one of the following
values: * `USE_FIXED_PORT`: The port number in `port` is used for health
checking.'
- "* `USE_NAMED_PORT`: The `portName` is used for health checking."
- "* `USE_SERVING_PORT`: For NetworkEndpointGroup, the port specified for
each network endpoint is used for health checking. For other backends, the
port or named port specified in the Backend Service is used for health checking."
- If not specified, HTTPS health check follows behavior specified in `port`
and `portName` fields.
- 'Some valid choices include: "USE_FIXED_PORT", "USE_NAMED_PORT", "USE_SERVING_PORT"'
required: false
type: str
version_added: 2.9
tcp_health_check:
description:
- A nested object resource.
Expand Down Expand Up @@ -243,6 +274,21 @@
required: false
default: NONE
type: str
port_specification:
description:
- 'Specifies how port is selected for health checking, can be one of the following
values: * `USE_FIXED_PORT`: The port number in `port` is used for health
checking.'
- "* `USE_NAMED_PORT`: The `portName` is used for health checking."
- "* `USE_SERVING_PORT`: For NetworkEndpointGroup, the port specified for
each network endpoint is used for health checking. For other backends, the
port or named port specified in the Backend Service is used for health checking."
- If not specified, TCP health check follows behavior specified in `port`
and `portName` fields.
- 'Some valid choices include: "USE_FIXED_PORT", "USE_NAMED_PORT", "USE_SERVING_PORT"'
required: false
type: str
version_added: 2.9
ssl_health_check:
description:
- A nested object resource.
Expand Down Expand Up @@ -283,6 +329,21 @@
required: false
default: NONE
type: str
port_specification:
description:
- 'Specifies how port is selected for health checking, can be one of the following
values: * `USE_FIXED_PORT`: The port number in `port` is used for health
checking.'
- "* `USE_NAMED_PORT`: The `portName` is used for health checking."
- "* `USE_SERVING_PORT`: For NetworkEndpointGroup, the port specified for
each network endpoint is used for health checking. For other backends, the
port or named port specified in the Backend Service is used for health checking."
- If not specified, SSL health check follows behavior specified in `port`
and `portName` fields.
- 'Some valid choices include: "USE_FIXED_PORT", "USE_NAMED_PORT", "USE_SERVING_PORT"'
required: false
type: str
version_added: 2.9
extends_documentation_fragment: gcp
notes:
- 'API Reference: U(https://cloud.google.com/compute/docs/reference/rest/v1/healthChecks)'
Expand Down Expand Up @@ -409,6 +470,18 @@
either NONE or PROXY_V1. The default is NONE.
returned: success
type: str
portSpecification:
description:
- 'Specifies how port is selected for health checking, can be one of the following
values: * `USE_FIXED_PORT`: The port number in `port` is used for health checking.'
- "* `USE_NAMED_PORT`: The `portName` is used for health checking."
- "* `USE_SERVING_PORT`: For NetworkEndpointGroup, the port specified for each
network endpoint is used for health checking. For other backends, the port
or named port specified in the Backend Service is used for health checking."
- If not specified, HTTP health check follows behavior specified in `port` and
`portName` fields.
returned: success
type: str
httpsHealthCheck:
description:
- A nested object resource.
Expand Down Expand Up @@ -453,6 +526,18 @@
either NONE or PROXY_V1. The default is NONE.
returned: success
type: str
portSpecification:
description:
- 'Specifies how port is selected for health checking, can be one of the following
values: * `USE_FIXED_PORT`: The port number in `port` is used for health checking.'
- "* `USE_NAMED_PORT`: The `portName` is used for health checking."
- "* `USE_SERVING_PORT`: For NetworkEndpointGroup, the port specified for each
network endpoint is used for health checking. For other backends, the port
or named port specified in the Backend Service is used for health checking."
- If not specified, HTTPS health check follows behavior specified in `port`
and `portName` fields.
returned: success
type: str
tcpHealthCheck:
description:
- A nested object resource.
Expand Down Expand Up @@ -491,6 +576,18 @@
either NONE or PROXY_V1. The default is NONE.
returned: success
type: str
portSpecification:
description:
- 'Specifies how port is selected for health checking, can be one of the following
values: * `USE_FIXED_PORT`: The port number in `port` is used for health checking.'
- "* `USE_NAMED_PORT`: The `portName` is used for health checking."
- "* `USE_SERVING_PORT`: For NetworkEndpointGroup, the port specified for each
network endpoint is used for health checking. For other backends, the port
or named port specified in the Backend Service is used for health checking."
- If not specified, TCP health check follows behavior specified in `port` and
`portName` fields.
returned: success
type: str
sslHealthCheck:
description:
- A nested object resource.
Expand Down Expand Up @@ -529,6 +626,18 @@
either NONE or PROXY_V1. The default is NONE.
returned: success
type: str
portSpecification:
description:
- 'Specifies how port is selected for health checking, can be one of the following
values: * `USE_FIXED_PORT`: The port number in `port` is used for health checking.'
- "* `USE_NAMED_PORT`: The `portName` is used for health checking."
- "* `USE_SERVING_PORT`: For NetworkEndpointGroup, the port specified for each
network endpoint is used for health checking. For other backends, the port
or named port specified in the Backend Service is used for health checking."
- If not specified, SSL health check follows behavior specified in `port` and
`portName` fields.
returned: success
type: str
'''

################################################################################
Expand Down Expand Up @@ -566,6 +675,7 @@ def main():
port=dict(type='int'),
port_name=dict(type='str'),
proxy_header=dict(default='NONE', type='str'),
port_specification=dict(type='str'),
),
),
https_health_check=dict(
Expand All @@ -577,6 +687,7 @@ def main():
port=dict(type='int'),
port_name=dict(type='str'),
proxy_header=dict(default='NONE', type='str'),
port_specification=dict(type='str'),
),
),
tcp_health_check=dict(
Expand All @@ -587,6 +698,7 @@ def main():
port=dict(type='int'),
port_name=dict(type='str'),
proxy_header=dict(default='NONE', type='str'),
port_specification=dict(type='str'),
),
),
ssl_health_check=dict(
Expand All @@ -597,6 +709,7 @@ def main():
port=dict(type='int'),
port_name=dict(type='str'),
proxy_header=dict(default='NONE', type='str'),
port_specification=dict(type='str'),
),
),
),
Expand Down Expand Up @@ -796,6 +909,7 @@ def to_request(self):
u'port': self.request.get('port'),
u'portName': self.request.get('port_name'),
u'proxyHeader': self.request.get('proxy_header'),
u'portSpecification': self.request.get('port_specification'),
}
)

Expand All @@ -808,6 +922,7 @@ def from_response(self):
u'port': self.request.get(u'port'),
u'portName': self.request.get(u'portName'),
u'proxyHeader': self.request.get(u'proxyHeader'),
u'portSpecification': self.request.get(u'portSpecification'),
}
)

Expand All @@ -829,6 +944,7 @@ def to_request(self):
u'port': self.request.get('port'),
u'portName': self.request.get('port_name'),
u'proxyHeader': self.request.get('proxy_header'),
u'portSpecification': self.request.get('port_specification'),
}
)

Expand All @@ -841,6 +957,7 @@ def from_response(self):
u'port': self.request.get(u'port'),
u'portName': self.request.get(u'portName'),
u'proxyHeader': self.request.get(u'proxyHeader'),
u'portSpecification': self.request.get(u'portSpecification'),
}
)

Expand All @@ -861,6 +978,7 @@ def to_request(self):
u'port': self.request.get('port'),
u'portName': self.request.get('port_name'),
u'proxyHeader': self.request.get('proxy_header'),
u'portSpecification': self.request.get('port_specification'),
}
)

Expand All @@ -872,6 +990,7 @@ def from_response(self):
u'port': self.request.get(u'port'),
u'portName': self.request.get(u'portName'),
u'proxyHeader': self.request.get(u'proxyHeader'),
u'portSpecification': self.request.get(u'portSpecification'),
}
)

Expand All @@ -892,6 +1011,7 @@ def to_request(self):
u'port': self.request.get('port'),
u'portName': self.request.get('port_name'),
u'proxyHeader': self.request.get('proxy_header'),
u'portSpecification': self.request.get('port_specification'),
}
)

Expand All @@ -903,6 +1023,7 @@ def from_response(self):
u'port': self.request.get(u'port'),
u'portName': self.request.get(u'portName'),
u'proxyHeader': self.request.get(u'proxyHeader'),
u'portSpecification': self.request.get(u'portSpecification'),
}
)

Expand Down
56 changes: 56 additions & 0 deletions lib/ansible/modules/cloud/google/gcp_compute_health_check_facts.py
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,20 @@
backend, either NONE or PROXY_V1. The default is NONE.
returned: success
type: str
portSpecification:
description:
- 'Specifies how port is selected for health checking, can be one of the
following values: * `USE_FIXED_PORT`: The port number in `port` is used
for health checking.'
- "* `USE_NAMED_PORT`: The `portName` is used for health checking."
- "* `USE_SERVING_PORT`: For NetworkEndpointGroup, the port specified for
each network endpoint is used for health checking. For other backends,
the port or named port specified in the Backend Service is used for health
checking."
- If not specified, HTTP health check follows behavior specified in `port`
and `portName` fields.
returned: success
type: str
httpsHealthCheck:
description:
- A nested object resource.
Expand Down Expand Up @@ -211,6 +225,20 @@
backend, either NONE or PROXY_V1. The default is NONE.
returned: success
type: str
portSpecification:
description:
- 'Specifies how port is selected for health checking, can be one of the
following values: * `USE_FIXED_PORT`: The port number in `port` is used
for health checking.'
- "* `USE_NAMED_PORT`: The `portName` is used for health checking."
- "* `USE_SERVING_PORT`: For NetworkEndpointGroup, the port specified for
each network endpoint is used for health checking. For other backends,
the port or named port specified in the Backend Service is used for health
checking."
- If not specified, HTTPS health check follows behavior specified in `port`
and `portName` fields.
returned: success
type: str
tcpHealthCheck:
description:
- A nested object resource.
Expand Down Expand Up @@ -250,6 +278,20 @@
backend, either NONE or PROXY_V1. The default is NONE.
returned: success
type: str
portSpecification:
description:
- 'Specifies how port is selected for health checking, can be one of the
following values: * `USE_FIXED_PORT`: The port number in `port` is used
for health checking.'
- "* `USE_NAMED_PORT`: The `portName` is used for health checking."
- "* `USE_SERVING_PORT`: For NetworkEndpointGroup, the port specified for
each network endpoint is used for health checking. For other backends,
the port or named port specified in the Backend Service is used for health
checking."
- If not specified, TCP health check follows behavior specified in `port`
and `portName` fields.
returned: success
type: str
sslHealthCheck:
description:
- A nested object resource.
Expand Down Expand Up @@ -289,6 +331,20 @@
backend, either NONE or PROXY_V1. The default is NONE.
returned: success
type: str
portSpecification:
description:
- 'Specifies how port is selected for health checking, can be one of the
following values: * `USE_FIXED_PORT`: The port number in `port` is used
for health checking.'
- "* `USE_NAMED_PORT`: The `portName` is used for health checking."
- "* `USE_SERVING_PORT`: For NetworkEndpointGroup, the port specified for
each network endpoint is used for health checking. For other backends,
the port or named port specified in the Backend Service is used for health
checking."
- If not specified, SSL health check follows behavior specified in `port`
and `portName` fields.
returned: success
type: str
'''

################################################################################
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
- present
- absent
default: present
type: str
check_interval_sec:
description:
- How often (in seconds) to send a health check. The default value is 5 seconds.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
- present
- absent
default: present
type: str
check_interval_sec:
description:
- How often (in seconds) to send a health check. The default value is 5 seconds.
Expand Down
1 change: 1 addition & 0 deletions lib/ansible/modules/cloud/google/gcp_compute_image.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@
- present
- absent
default: present
type: str
description:
description:
- An optional description of this resource. Provide this property when you create
Expand Down
1 change: 1 addition & 0 deletions lib/ansible/modules/cloud/google/gcp_compute_instance.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
- present
- absent
default: present
type: str
can_ip_forward:
description:
- Allows this instance to send and receive packets with non-matching destination
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
- present
- absent
default: present
type: str
description:
description:
- An optional description of this resource. Provide this property when you create
Expand Down