Skip to content

Commit

Permalink
Merge pull request #1560 from apichick/ha-vpn-over-blueprint-fix
Browse files Browse the repository at this point in the history 
Removed unused attribute in variable of ha-vpn-over-blueprint blueprint
  • Loading branch information
@apichick
apichick committed Aug 2, 2023
2 parents 43e73ab + ad24b59 commit b99fd17
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 17 deletions.
16 changes: 5 additions & 11 deletions blueprints/networking/ha-vpn-over-interconnect/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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&#40;&#123;&#10; gcp_bgp &#61; object&#40;&#123;&#10; asn &#61; number&#10; name &#61; optional&#40;string&#41;&#10; keepalive &#61; optional&#40;number&#41;&#10; custom_advertise &#61; optional&#40;object&#40;&#123;&#10; all_subnets &#61; bool&#10; ip_ranges &#61; map&#40;string&#41;&#10; &#125;&#41;&#41;&#10; &#125;&#41;&#10; onprem_vpn_gateway &#61; object&#40;&#123;&#10; redundancy_type &#61; optional&#40;string, &#34;TWO_IPS_REDUNDANCY&#34;&#41;&#10; interfaces &#61; list&#40;string&#41;&#10; &#125;&#41;&#10; gateways &#61; map&#40;map&#40;object&#40;&#123;&#10; bgp_peer &#61; object&#40;&#123;&#10; address &#61; string&#10; asn &#61; number&#10; route_priority &#61; optional&#40;number, 1000&#41;&#10; custom_advertise &#61; optional&#40;object&#40;&#123;&#10; all_subnets &#61; bool&#10; all_vpc_subnets &#61; bool&#10; all_peer_vpc_subnets &#61; bool&#10; ip_ranges &#61; map&#40;string&#41;&#10; &#125;&#41;&#41;&#10; &#125;&#41;&#10; bgp_session_range &#61; string&#10; ike_version &#61; optional&#40;number, 2&#41;&#10; peer_external_gateway_interface &#61; optional&#40;number&#41;&#10; peer_gateway &#61; optional&#40;string, &#34;default&#34;&#41;&#10; router &#61; optional&#40;string&#41;&#10; shared_secret &#61; optional&#40;string&#41;&#10; vpn_gateway_interface &#61; number&#10; &#125;&#41;&#41;&#10; &#41;&#10;&#125;&#41;">object&#40;&#123;&#8230;&#125;&#41;</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&#40;&#123;&#10; attachments &#61; map&#40;object&#40;&#123;&#10; bandwidth &#61; optional&#40;string, &#34;BPS_10G&#34;&#41;&#10; base_name &#61; optional&#40;string, &#34;encrypted-vlan-attachment&#34;&#41;&#10; bgp_range &#61; string&#10; interconnect_self_link &#61; string&#10; onprem_asn &#61; number&#10; vlan_tag &#61; number&#10; vpn_gateways_ip_range &#61; string&#10; &#125;&#41;&#41;&#10; gcp_bgp &#61; object&#40;&#123;&#10; asn &#61; number&#10; &#125;&#41;&#10; interconnect_type &#61; optional&#40;string, &#34;DEDICATED&#34;&#41;&#10;&#125;&#41;">object&#40;&#123;&#8230;&#125;&#41;</code> | ✓ | |
| [overlay_config](variables.tf#L24) | Configuration for the overlay resources. | <code title="object&#40;&#123;&#10; gcp_bgp &#61; object&#40;&#123;&#10; asn &#61; number&#10; name &#61; optional&#40;string&#41;&#10; keepalive &#61; optional&#40;number&#41;&#10; custom_advertise &#61; optional&#40;object&#40;&#123;&#10; all_subnets &#61; bool&#10; ip_ranges &#61; map&#40;string&#41;&#10; &#125;&#41;&#41;&#10; &#125;&#41;&#10; onprem_vpn_gateway_interfaces &#61; list&#40;string&#41;&#10; gateways &#61; map&#40;map&#40;object&#40;&#123;&#10; bgp_peer &#61; object&#40;&#123;&#10; address &#61; string&#10; asn &#61; number&#10; route_priority &#61; optional&#40;number, 1000&#41;&#10; custom_advertise &#61; optional&#40;object&#40;&#123;&#10; all_subnets &#61; bool&#10; all_vpc_subnets &#61; bool&#10; all_peer_vpc_subnets &#61; bool&#10; ip_ranges &#61; map&#40;string&#41;&#10; &#125;&#41;&#41;&#10; &#125;&#41;&#10; bgp_session_range &#61; string&#10; ike_version &#61; optional&#40;number, 2&#41;&#10; peer_external_gateway_interface &#61; optional&#40;number&#41;&#10; peer_gateway &#61; optional&#40;string, &#34;default&#34;&#41;&#10; router &#61; optional&#40;string&#41;&#10; shared_secret &#61; optional&#40;string&#41;&#10; vpn_gateway_interface &#61; number&#10; &#125;&#41;&#41;&#10; &#41;&#10;&#125;&#41;">object&#40;&#123;&#8230;&#125;&#41;</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&#40;&#123;&#10; attachments &#61; map&#40;object&#40;&#123;&#10; bandwidth &#61; optional&#40;string, &#34;BPS_10G&#34;&#41;&#10; base_name &#61; optional&#40;string, &#34;encrypted-vlan-attachment&#34;&#41;&#10; bgp_range &#61; string&#10; interconnect_self_link &#61; string&#10; onprem_asn &#61; number&#10; vlan_tag &#61; number&#10; vpn_gateways_ip_range &#61; string&#10; &#125;&#41;&#41;&#10; gcp_bgp &#61; object&#40;&#123;&#10; asn &#61; number&#10; &#125;&#41;&#10; interconnect_type &#61; optional&#40;string, &#34;DEDICATED&#34;&#41;&#10;&#125;&#41;">object&#40;&#123;&#8230;&#125;&#41;</code> | ✓ | |

## Outputs

| name | description | sensitive |
|---|---|:---:|
| [underlay](outputs.tf#L17) | Setup for the underlay connection. | |

<!-- END TFDOC -->
## Test

Expand All @@ -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 = {
Expand Down
4 changes: 2 additions & 2 deletions blueprints/networking/ha-vpn-over-interconnect/overlay.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 1 addition & 4 deletions blueprints/networking/ha-vpn-over-interconnect/variables.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit b99fd17

Please sign in to comment.