Merge pull request #1560 from apichick/ha-vpn-over-blueprint-fix
Removed unused attribute in variable of ha-vpn-over-blueprint blueprint
This commit is contained in:
commit
b99fd17887
|
@ -24,26 +24,22 @@ A single pre-existing project and a VPC is used in this blueprint to keep variab
|
|||
The provided project needs a valid billing account and the Compute APIs enabled.
|
||||
|
||||
The two Dedicated Interconnect connections should already exist, either in the same project or in any other project belonging to the same GCP Organization.
|
||||
|
||||
|
||||
<!-- BEGIN TFDOC -->
|
||||
|
||||
## Variables
|
||||
|
||||
| name | description | type | required | default |
|
||||
|---|---|:---:|:---:|:---:|
|
||||
| [network](variables.tf#L18) | The VPC name to which resources are associated to. | <code>string</code> | ✓ | |
|
||||
| [overlay_config](variables.tf#L24) | Configuration for the overlay resources. | <code title="object({ gcp_bgp = object({ asn = number name = optional(string) keepalive = optional(number) custom_advertise = optional(object({ all_subnets = bool ip_ranges = map(string) })) }) onprem_vpn_gateway = object({ redundancy_type = optional(string, "TWO_IPS_REDUNDANCY") interfaces = list(string) }) gateways = map(map(object({ bgp_peer = object({ address = string asn = number route_priority = optional(number, 1000) custom_advertise = optional(object({ all_subnets = bool all_vpc_subnets = bool all_peer_vpc_subnets = bool ip_ranges = map(string) })) }) bgp_session_range = string ike_version = optional(number, 2) peer_external_gateway_interface = optional(number) peer_gateway = optional(string, "default") router = optional(string) shared_secret = optional(string) vpn_gateway_interface = number })) ) })">object({…})</code> | ✓ | |
|
||||
| [project_id](variables.tf#L66) | The project id. | <code>string</code> | ✓ | |
|
||||
| [region](variables.tf#L71) | GCP Region. | <code>string</code> | ✓ | |
|
||||
| [underlay_config](variables.tf#L76) | Configuration for the underlay resources. | <code title="object({ attachments = map(object({ bandwidth = optional(string, "BPS_10G") base_name = optional(string, "encrypted-vlan-attachment") bgp_range = string interconnect_self_link = string onprem_asn = number vlan_tag = number vpn_gateways_ip_range = string })) gcp_bgp = object({ asn = number }) interconnect_type = optional(string, "DEDICATED") })">object({…})</code> | ✓ | |
|
||||
| [overlay_config](variables.tf#L24) | Configuration for the overlay resources. | <code title="object({ gcp_bgp = object({ asn = number name = optional(string) keepalive = optional(number) custom_advertise = optional(object({ all_subnets = bool ip_ranges = map(string) })) }) onprem_vpn_gateway_interfaces = list(string) gateways = map(map(object({ bgp_peer = object({ address = string asn = number route_priority = optional(number, 1000) custom_advertise = optional(object({ all_subnets = bool all_vpc_subnets = bool all_peer_vpc_subnets = bool ip_ranges = map(string) })) }) bgp_session_range = string ike_version = optional(number, 2) peer_external_gateway_interface = optional(number) peer_gateway = optional(string, "default") router = optional(string) shared_secret = optional(string) vpn_gateway_interface = number })) ) })">object({…})</code> | ✓ | |
|
||||
| [project_id](variables.tf#L63) | The project id. | <code>string</code> | ✓ | |
|
||||
| [region](variables.tf#L68) | GCP Region. | <code>string</code> | ✓ | |
|
||||
| [underlay_config](variables.tf#L73) | Configuration for the underlay resources. | <code title="object({ attachments = map(object({ bandwidth = optional(string, "BPS_10G") base_name = optional(string, "encrypted-vlan-attachment") bgp_range = string interconnect_self_link = string onprem_asn = number vlan_tag = number vpn_gateways_ip_range = string })) gcp_bgp = object({ asn = number }) interconnect_type = optional(string, "DEDICATED") })">object({…})</code> | ✓ | |
|
||||
|
||||
## Outputs
|
||||
|
||||
| name | description | sensitive |
|
||||
|---|---|:---:|
|
||||
| [underlay](outputs.tf#L17) | Setup for the underlay connection. | |
|
||||
|
||||
<!-- END TFDOC -->
|
||||
## Test
|
||||
|
||||
|
@ -64,9 +60,7 @@ module "test" {
|
|||
}
|
||||
}
|
||||
}
|
||||
onprem_vpn_gateway = {
|
||||
interfaces = ["172.16.0.1", "172.16.0.2"]
|
||||
}
|
||||
onprem_vpn_gateway_interfaces = ["172.16.0.1", "172.16.0.2"]
|
||||
gateways = {
|
||||
a = {
|
||||
remote-0 = {
|
||||
|
|
|
@ -47,9 +47,9 @@ resource "google_compute_external_vpn_gateway" "default" {
|
|||
name = "peer-vpn-gateway"
|
||||
project = var.project_id
|
||||
description = "Peer IPSec over Interconnect VPN gateway"
|
||||
redundancy_type = length(var.overlay_config.onprem_vpn_gateway) == 2 ? "TWO_IPS_REDUNDANCY" : "SINGLE_IP_INTERNALLY_REDUNDANT"
|
||||
redundancy_type = length(var.overlay_config.onprem_vpn_gateway_interfaces) == 2 ? "TWO_IPS_REDUNDANCY" : "SINGLE_IP_INTERNALLY_REDUNDANT"
|
||||
dynamic "interface" {
|
||||
for_each = var.overlay_config.onprem_vpn_gateway.interfaces
|
||||
for_each = var.overlay_config.onprem_vpn_gateway_interfaces
|
||||
content {
|
||||
id = interface.key
|
||||
ip_address = interface.value
|
||||
|
|
|
@ -33,10 +33,7 @@ variable "overlay_config" {
|
|||
ip_ranges = map(string)
|
||||
}))
|
||||
})
|
||||
onprem_vpn_gateway = object({
|
||||
redundancy_type = optional(string, "TWO_IPS_REDUNDANCY")
|
||||
interfaces = list(string)
|
||||
})
|
||||
onprem_vpn_gateway_interfaces = list(string)
|
||||
gateways = map(map(object({
|
||||
bgp_peer = object({
|
||||
address = string
|
||||
|
|
Loading…
Reference in New Issue