diff --git a/plugins/modules/gcp_compute_route.py b/plugins/modules/gcp_compute_route.py index 8f6e636..2cc9293 100644 --- a/plugins/modules/gcp_compute_route.py +++ b/plugins/modules/gcp_compute_route.py @@ -124,6 +124,10 @@ options: next_hop_vpn_tunnel: description: - URL to a VpnTunnel that should handle matching packets. + - 'This field represents a link to a VpnTunnel resource in GCP. It can be specified + in two ways. First, you can place in the selfLink of the resource here as a + string Alternatively, you can add `register: name-of-resource` to a gcp_compute_vpn_tunnel + task and then set this next_hop_vpn_tunnel field to "{{ name-of-resource }}"' required: false extends_documentation_fragment: gcp notes: @@ -260,7 +264,7 @@ def main(): next_hop_gateway=dict(type='str'), next_hop_instance=dict(type='dict'), next_hop_ip=dict(type='str'), - next_hop_vpn_tunnel=dict(type='dict'), + next_hop_vpn_tunnel=dict() ) ) @@ -321,7 +325,7 @@ def resource_to_request(module): u'nextHopGateway': module.params.get('next_hop_gateway'), u'nextHopInstance': replace_resource_dict(module.params.get(u'next_hop_instance', {}), 'selfLink'), u'nextHopIp': module.params.get('next_hop_ip'), - u'nextHopVpnTunnel': replace_resource_dict(module.params.get(u'next_hop_vpn_tunnel', {}), 'selfLink'), + u'nextHopVpnTunnel': replace_resource_dict(module.params.get(u'next_hop_vpn_tunnel', {}), 'selfLink') } return_vals = {} for k, v in request.items(): @@ -397,7 +401,7 @@ def response_to_hash(module, response): u'nextHopInstance': replace_resource_dict(module.params.get(u'next_hop_instance', {}), 'selfLink'), u'nextHopIp': module.params.get('next_hop_ip'), u'nextHopVpnTunnel': replace_resource_dict(module.params.get(u'next_hop_vpn_tunnel', {}), 'selfLink'), - u'nextHopNetwork': response.get(u'nextHopNetwork'), + u'nextHopNetwork': response.get(u'nextHopNetwork') } diff --git a/plugins/modules/gcp_compute_target_vpn_gateway.py b/plugins/modules/gcp_compute_target_vpn_gateway.py index f1a411b..c313144 100644 --- a/plugins/modules/gcp_compute_target_vpn_gateway.py +++ b/plugins/modules/gcp_compute_target_vpn_gateway.py @@ -142,12 +142,13 @@ network: type: str tunnels: description: - - A list of references to VpnTunnel resources associated to this VPN gateway. + - A list of references to VpnTunnel resources associated with this VPN gateway. returned: success type: list forwardingRules: description: - - A list of references to the ForwardingRule resources associated to this VPN gateway. + - A list of references to the ForwardingRule resources associated with this VPN + gateway. returned: success type: list region: diff --git a/plugins/modules/gcp_compute_target_vpn_gateway_facts.py b/plugins/modules/gcp_compute_target_vpn_gateway_facts.py index b00033a..5a11275 100644 --- a/plugins/modules/gcp_compute_target_vpn_gateway_facts.py +++ b/plugins/modules/gcp_compute_target_vpn_gateway_facts.py @@ -101,13 +101,13 @@ items: type: str tunnels: description: - - A list of references to VpnTunnel resources associated to this VPN gateway. + - A list of references to VpnTunnel resources associated with this VPN gateway. returned: success type: list forwardingRules: description: - - A list of references to the ForwardingRule resources associated to this VPN - gateway. + - A list of references to the ForwardingRule resources associated with this + VPN gateway. returned: success type: list region: