From f6589839fbfc85750314ac3276d8f22f9037088e Mon Sep 17 00:00:00 2001 From: Houssem Dellai Date: Mon, 29 Jan 2024 16:07:42 +0100 Subject: [PATCH] added 810 net gateway --- 800_onprem_vpn_gateway_p2s/vnet-hub.tf | 10 +- 800_onprem_vpn_gateway_p2s/vpn_gateway.tf | 2 +- 810_onprem_vpn_gateway_p2s_hub_spokes/rg.tf | 2 +- .../terraform.tfstate | 236 ++++++++---------- .../vnet-hub.tf | 10 +- .../vpn_gateway.tf | 2 +- 6 files changed, 124 insertions(+), 138 deletions(-) diff --git a/800_onprem_vpn_gateway_p2s/vnet-hub.tf b/800_onprem_vpn_gateway_p2s/vnet-hub.tf index adff6d3..ed5dd6e 100644 --- a/800_onprem_vpn_gateway_p2s/vnet-hub.tf +++ b/800_onprem_vpn_gateway_p2s/vnet-hub.tf @@ -6,16 +6,16 @@ resource "azurerm_virtual_network" "vnet-hub" { dns_servers = null } -resource "azurerm_subnet" "subnet-gateway" { - name = "GatewaySubnet" +resource "azurerm_subnet" "subnet-vm" { + name = "subnet-vm" resource_group_name = azurerm_virtual_network.vnet-hub.resource_group_name virtual_network_name = azurerm_virtual_network.vnet-hub.name address_prefixes = ["10.0.0.0/24"] } -resource "azurerm_subnet" "subnet-vm" { - name = "subnet-vm" +resource "azurerm_subnet" "subnet-gateway" { + name = "GatewaySubnet" resource_group_name = azurerm_virtual_network.vnet-hub.resource_group_name virtual_network_name = azurerm_virtual_network.vnet-hub.name - address_prefixes = ["10.0.2.0/24"] + address_prefixes = ["10.0.1.0/24"] } \ No newline at end of file diff --git a/800_onprem_vpn_gateway_p2s/vpn_gateway.tf b/800_onprem_vpn_gateway_p2s/vpn_gateway.tf index 9d00f21..1b757d1 100644 --- a/800_onprem_vpn_gateway_p2s/vpn_gateway.tf +++ b/800_onprem_vpn_gateway_p2s/vpn_gateway.tf @@ -29,7 +29,7 @@ resource "azurerm_virtual_network_gateway" "vpn-gateway" { } vpn_client_configuration { - address_space = ["10.1.0.0/24"] + address_space = ["172.16.0.0/24"] root_certificate { name = "P2SRootCert800" diff --git a/810_onprem_vpn_gateway_p2s_hub_spokes/rg.tf b/810_onprem_vpn_gateway_p2s_hub_spokes/rg.tf index bc72363..5300986 100644 --- a/810_onprem_vpn_gateway_p2s_hub_spokes/rg.tf +++ b/810_onprem_vpn_gateway_p2s_hub_spokes/rg.tf @@ -1,4 +1,4 @@ resource "azurerm_resource_group" "rg" { - name = "rg-hub-${var.prefix}" + name = "rg-hub-vpngw-${var.prefix}" location = "westeurope" } \ No newline at end of file diff --git a/810_onprem_vpn_gateway_p2s_hub_spokes/terraform.tfstate b/810_onprem_vpn_gateway_p2s_hub_spokes/terraform.tfstate index 3154299..40cfd3f 100644 --- a/810_onprem_vpn_gateway_p2s_hub_spokes/terraform.tfstate +++ b/810_onprem_vpn_gateway_p2s_hub_spokes/terraform.tfstate @@ -1,8 +1,8 @@ { "version": 4, "terraform_version": "1.7.1", - "serial": 121, - "lineage": "09a10308-acdc-61cb-31fa-2d607cf4f7d0", + "serial": 35, + "lineage": "78a6bc1b-c560-8d8b-da38-ab96f53e3706", "outputs": { "private_dns_zone_fqdn": { "value": "vm.internal.corp.", @@ -17,7 +17,7 @@ "type": "string" }, "vm_linux_hub_private_ip": { - "value": "10.0.2.4", + "value": "10.0.0.4", "type": "string" }, "vm_linux_spoke1_private_ip": { @@ -62,14 +62,14 @@ "eviction_policy": "", "extensions_time_budget": "PT1H30M", "gallery_application": [], - "id": "/subscriptions/38977b70-47bf-4da5-a492-88712fce8725/resourceGroups/rg-hub-810/providers/Microsoft.Compute/virtualMachines/vm-linux", + "id": "/subscriptions/38977b70-47bf-4da5-a492-88712fce8725/resourceGroups/rg-hub-vpngw-810/providers/Microsoft.Compute/virtualMachines/vm-linux", "identity": [], "license_type": "", "location": "westeurope", "max_bid_price": -1, "name": "vm-linux", "network_interface_ids": [ - "/subscriptions/38977b70-47bf-4da5-a492-88712fce8725/resourceGroups/rg-hub-810/providers/Microsoft.Network/networkInterfaces/nic-vm" + "/subscriptions/38977b70-47bf-4da5-a492-88712fce8725/resourceGroups/rg-hub-vpngw-810/providers/Microsoft.Network/networkInterfaces/nic-vm" ], "os_disk": [ { @@ -77,7 +77,7 @@ "diff_disk_settings": [], "disk_encryption_set_id": "", "disk_size_gb": 30, - "name": "vm-linux_disk1_4acfb3a378a742c096aea05218fd1d73", + "name": "vm-linux_OsDisk_1_d93cd1c2be3e4b7fb13400141b10562b", "secure_vm_disk_encryption_set_id": "", "security_encryption_type": "", "storage_account_type": "Standard_LRS", @@ -89,18 +89,18 @@ "plan": [], "platform_fault_domain": -1, "priority": "Regular", - "private_ip_address": "10.0.2.4", + "private_ip_address": "10.0.0.4", "private_ip_addresses": [ - "10.0.2.4" + "10.0.0.4" ], "provision_vm_agent": true, "proximity_placement_group_id": "", - "public_ip_address": "108.143.61.119", + "public_ip_address": "20.61.195.132", "public_ip_addresses": [ - "108.143.61.119" + "20.61.195.132" ], "reboot_setting": "", - "resource_group_name": "rg-hub-810", + "resource_group_name": "rg-hub-vpngw-810", "secret": [], "secure_boot_enabled": false, "size": "Standard_B2als_v2", @@ -117,7 +117,7 @@ "termination_notification": [], "timeouts": null, "user_data": "", - "virtual_machine_id": "a9d857e6-e9c4-45d1-9bd5-a0acbd12cf92", + "virtual_machine_id": "8974d8db-4de3-4f1e-8ed2-fd484aff086e", "virtual_machine_scale_set_id": "", "vtpm_enabled": false, "zone": "" @@ -150,32 +150,32 @@ "edge_zone": "", "enable_accelerated_networking": false, "enable_ip_forwarding": false, - "id": "/subscriptions/38977b70-47bf-4da5-a492-88712fce8725/resourceGroups/rg-hub-810/providers/Microsoft.Network/networkInterfaces/nic-vm", + "id": "/subscriptions/38977b70-47bf-4da5-a492-88712fce8725/resourceGroups/rg-hub-vpngw-810/providers/Microsoft.Network/networkInterfaces/nic-vm", "internal_dns_name_label": "", - "internal_domain_name_suffix": "wztbmbrxyttudap5egg4zfwokd.ax.internal.cloudapp.net", + "internal_domain_name_suffix": "kvvg0c314jju5fqzjimt4ht41b.ax.internal.cloudapp.net", "ip_configuration": [ { "gateway_load_balancer_frontend_ip_configuration_id": "", "name": "internal", "primary": true, - "private_ip_address": "10.0.2.4", + "private_ip_address": "10.0.0.4", "private_ip_address_allocation": "Dynamic", "private_ip_address_version": "IPv4", - "public_ip_address_id": "/subscriptions/38977b70-47bf-4da5-a492-88712fce8725/resourceGroups/rg-hub-810/providers/Microsoft.Network/publicIPAddresses/pip-vm", - "subnet_id": "/subscriptions/38977b70-47bf-4da5-a492-88712fce8725/resourceGroups/rg-hub-810/providers/Microsoft.Network/virtualNetworks/vnet-hub-weu/subnets/subnet-vm" + "public_ip_address_id": "/subscriptions/38977b70-47bf-4da5-a492-88712fce8725/resourceGroups/rg-hub-vpngw-810/providers/Microsoft.Network/publicIPAddresses/pip-vm", + "subnet_id": "/subscriptions/38977b70-47bf-4da5-a492-88712fce8725/resourceGroups/rg-hub-vpngw-810/providers/Microsoft.Network/virtualNetworks/vnet-hub-weu/subnets/subnet-vm" } ], "location": "westeurope", - "mac_address": "60-45-BD-97-B3-16", + "mac_address": "00-22-48-80-D4-F7", "name": "nic-vm", - "private_ip_address": "10.0.2.4", + "private_ip_address": "10.0.0.4", "private_ip_addresses": [ - "10.0.2.4" + "10.0.0.4" ], - "resource_group_name": "rg-hub-810", + "resource_group_name": "rg-hub-vpngw-810", "tags": {}, "timeouts": null, - "virtual_machine_id": "/subscriptions/38977b70-47bf-4da5-a492-88712fce8725/resourceGroups/rg-hub-810/providers/Microsoft.Compute/virtualMachines/vm-linux" + "virtual_machine_id": "/subscriptions/38977b70-47bf-4da5-a492-88712fce8725/resourceGroups/rg-hub-vpngw-810/providers/Microsoft.Compute/virtualMachines/vm-linux" }, "sensitive_attributes": [], "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjoxODAwMDAwMDAwMDAwLCJkZWxldGUiOjE4MDAwMDAwMDAwMDAsInJlYWQiOjMwMDAwMDAwMDAwMCwidXBkYXRlIjoxODAwMDAwMDAwMDAwfX0=", @@ -198,12 +198,12 @@ "schema_version": 0, "attributes": { "fqdn": "vm.internal.corp.", - "id": "/subscriptions/38977b70-47bf-4da5-a492-88712fce8725/resourceGroups/rg-hub-810/providers/Microsoft.Network/privateDnsZones/internal.corp/A/vm", + "id": "/subscriptions/38977b70-47bf-4da5-a492-88712fce8725/resourceGroups/rg-hub-vpngw-810/providers/Microsoft.Network/privateDnsZones/internal.corp/A/vm", "name": "vm", "records": [ - "10.0.2.4" + "10.0.0.4" ], - "resource_group_name": "rg-hub-810", + "resource_group_name": "rg-hub-vpngw-810", "tags": {}, "timeouts": null, "ttl": 300, @@ -232,13 +232,13 @@ { "schema_version": 0, "attributes": { - "id": "/subscriptions/38977b70-47bf-4da5-a492-88712fce8725/resourceGroups/rg-hub-810/providers/Microsoft.Network/privateDnsZones/internal.corp", + "id": "/subscriptions/38977b70-47bf-4da5-a492-88712fce8725/resourceGroups/rg-hub-vpngw-810/providers/Microsoft.Network/privateDnsZones/internal.corp", "max_number_of_record_sets": 25000, "max_number_of_virtual_network_links": 1000, "max_number_of_virtual_network_links_with_registration": 100, "name": "internal.corp", "number_of_record_sets": 2, - "resource_group_name": "rg-hub-810", + "resource_group_name": "rg-hub-vpngw-810", "soa_record": [ { "email": "azureprivatedns-host.microsoft.com", @@ -273,14 +273,14 @@ { "schema_version": 0, "attributes": { - "id": "/subscriptions/38977b70-47bf-4da5-a492-88712fce8725/resourceGroups/rg-hub-810/providers/Microsoft.Network/privateDnsZones/internal.corp/virtualNetworkLinks/link-dns-vnet", + "id": "/subscriptions/38977b70-47bf-4da5-a492-88712fce8725/resourceGroups/rg-hub-vpngw-810/providers/Microsoft.Network/privateDnsZones/internal.corp/virtualNetworkLinks/link-dns-vnet", "name": "link-dns-vnet", "private_dns_zone_name": "internal.corp", "registration_enabled": false, - "resource_group_name": "rg-hub-810", + "resource_group_name": "rg-hub-vpngw-810", "tags": {}, "timeouts": null, - "virtual_network_id": "/subscriptions/38977b70-47bf-4da5-a492-88712fce8725/resourceGroups/rg-hub-810/providers/Microsoft.Network/virtualNetworks/vnet-hub-weu" + "virtual_network_id": "/subscriptions/38977b70-47bf-4da5-a492-88712fce8725/resourceGroups/rg-hub-vpngw-810/providers/Microsoft.Network/virtualNetworks/vnet-hub-weu" }, "sensitive_attributes": [], "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjoxODAwMDAwMDAwMDAwLCJkZWxldGUiOjE4MDAwMDAwMDAwMDAsInJlYWQiOjMwMDAwMDAwMDAwMCwidXBkYXRlIjoxODAwMDAwMDAwMDAwfX0=", @@ -307,15 +307,15 @@ "domain_name_label": null, "edge_zone": "", "fqdn": null, - "id": "/subscriptions/38977b70-47bf-4da5-a492-88712fce8725/resourceGroups/rg-hub-810/providers/Microsoft.Network/publicIPAddresses/pip-vm", + "id": "/subscriptions/38977b70-47bf-4da5-a492-88712fce8725/resourceGroups/rg-hub-vpngw-810/providers/Microsoft.Network/publicIPAddresses/pip-vm", "idle_timeout_in_minutes": 4, - "ip_address": "108.143.61.119", + "ip_address": "20.61.195.132", "ip_tags": {}, "ip_version": "IPv4", "location": "westeurope", "name": "pip-vm", "public_ip_prefix_id": null, - "resource_group_name": "rg-hub-810", + "resource_group_name": "rg-hub-vpngw-810", "reverse_fqdn": null, "sku": "Basic", "sku_tier": "Regional", @@ -346,15 +346,15 @@ "domain_name_label": null, "edge_zone": "", "fqdn": null, - "id": "/subscriptions/38977b70-47bf-4da5-a492-88712fce8725/resourceGroups/rg-hub-810/providers/Microsoft.Network/publicIPAddresses/pip-vnet-gateway", + "id": "/subscriptions/38977b70-47bf-4da5-a492-88712fce8725/resourceGroups/rg-hub-vpngw-810/providers/Microsoft.Network/publicIPAddresses/pip-vnet-gateway", "idle_timeout_in_minutes": 4, - "ip_address": "23.97.138.250", + "ip_address": "52.166.194.81", "ip_tags": {}, "ip_version": "IPv4", "location": "westeurope", "name": "pip-vnet-gateway", "public_ip_prefix_id": null, - "resource_group_name": "rg-hub-810", + "resource_group_name": "rg-hub-vpngw-810", "reverse_fqdn": null, "sku": "Basic", "sku_tier": "Regional", @@ -379,10 +379,10 @@ { "schema_version": 0, "attributes": { - "id": "/subscriptions/38977b70-47bf-4da5-a492-88712fce8725/resourceGroups/rg-hub-810", + "id": "/subscriptions/38977b70-47bf-4da5-a492-88712fce8725/resourceGroups/rg-hub-vpngw-810", "location": "westeurope", "managed_by": "", - "name": "rg-hub-810", + "name": "rg-hub-vpngw-810", "tags": {}, "timeouts": null }, @@ -426,7 +426,7 @@ "default_to_oauth_authentication": false, "edge_zone": "", "enable_https_traffic_only": true, - "id": "/subscriptions/38977b70-47bf-4da5-a492-88712fce8725/resourceGroups/rg-hub-810/providers/Microsoft.Storage/storageAccounts/storageaccgw810", + "id": "/subscriptions/38977b70-47bf-4da5-a492-88712fce8725/resourceGroups/rg-hub-vpngw-810/providers/Microsoft.Storage/storageAccounts/storageaccgw810", "identity": [], "immutability_policy": [], "infrastructure_encryption_enabled": false, @@ -447,15 +447,15 @@ } ], "nfsv3_enabled": false, - "primary_access_key": "3IqX+NNe739MHI3EARXnBcYDix+onpoQXvUmzfMbE01ChXptn3UCDh0OcWbibZLSOIm96VvaY+yf+AStt6kLrQ==", - "primary_blob_connection_string": "DefaultEndpointsProtocol=https;BlobEndpoint=https://storageaccgw810.blob.core.windows.net/;AccountName=storageaccgw810;AccountKey=3IqX+NNe739MHI3EARXnBcYDix+onpoQXvUmzfMbE01ChXptn3UCDh0OcWbibZLSOIm96VvaY+yf+AStt6kLrQ==", + "primary_access_key": "RwCs2Yzj6nnHuUD/cdIMTLDTJf3krg1rjFGRnQus54d+dvFClKokI42xqWD/kfcGxfY6n2r78WUz+AStFXYAfQ==", + "primary_blob_connection_string": "DefaultEndpointsProtocol=https;BlobEndpoint=https://storageaccgw810.blob.core.windows.net/;AccountName=storageaccgw810;AccountKey=RwCs2Yzj6nnHuUD/cdIMTLDTJf3krg1rjFGRnQus54d+dvFClKokI42xqWD/kfcGxfY6n2r78WUz+AStFXYAfQ==", "primary_blob_endpoint": "https://storageaccgw810.blob.core.windows.net/", "primary_blob_host": "storageaccgw810.blob.core.windows.net", "primary_blob_internet_endpoint": null, "primary_blob_internet_host": null, "primary_blob_microsoft_endpoint": null, "primary_blob_microsoft_host": null, - "primary_connection_string": "DefaultEndpointsProtocol=https;AccountName=storageaccgw810;AccountKey=3IqX+NNe739MHI3EARXnBcYDix+onpoQXvUmzfMbE01ChXptn3UCDh0OcWbibZLSOIm96VvaY+yf+AStt6kLrQ==;EndpointSuffix=core.windows.net", + "primary_connection_string": "DefaultEndpointsProtocol=https;AccountName=storageaccgw810;AccountKey=RwCs2Yzj6nnHuUD/cdIMTLDTJf3krg1rjFGRnQus54d+dvFClKokI42xqWD/kfcGxfY6n2r78WUz+AStFXYAfQ==;EndpointSuffix=core.windows.net", "primary_dfs_endpoint": "https://storageaccgw810.dfs.core.windows.net/", "primary_dfs_host": "storageaccgw810.dfs.core.windows.net", "primary_dfs_internet_endpoint": null, @@ -515,10 +515,10 @@ ] } ], - "resource_group_name": "rg-hub-810", + "resource_group_name": "rg-hub-vpngw-810", "routing": [], "sas_policy": [], - "secondary_access_key": "7AGtX5aYubWNz0g9lPNbLQ7i8swvl0ftt5KlTa/wdsRNz2SqeBbdQlvEYFmdlQEv4PcAme4omAH1+AStbfOoPA==", + "secondary_access_key": "dTGfKQUXkgx1kOlxoPjvtcc1gXvVUdvKXQc+ksKKxJ2zsFde0ADXQR37cQQ5gq8YIKYncNiFCACt+AStes4cgQ==", "secondary_blob_connection_string": "", "secondary_blob_endpoint": null, "secondary_blob_host": null, @@ -526,7 +526,7 @@ "secondary_blob_internet_host": null, "secondary_blob_microsoft_endpoint": null, "secondary_blob_microsoft_host": null, - "secondary_connection_string": "DefaultEndpointsProtocol=https;AccountName=storageaccgw810;AccountKey=7AGtX5aYubWNz0g9lPNbLQ7i8swvl0ftt5KlTa/wdsRNz2SqeBbdQlvEYFmdlQEv4PcAme4omAH1+AStbfOoPA==;EndpointSuffix=core.windows.net", + "secondary_connection_string": "DefaultEndpointsProtocol=https;AccountName=storageaccgw810;AccountKey=dTGfKQUXkgx1kOlxoPjvtcc1gXvVUdvKXQc+ksKKxJ2zsFde0ADXQR37cQQ5gq8YIKYncNiFCACt+AStes4cgQ==;EndpointSuffix=core.windows.net", "secondary_dfs_endpoint": null, "secondary_dfs_host": null, "secondary_dfs_internet_endpoint": null, @@ -632,7 +632,7 @@ "id": "https://storageaccgw810.blob.core.windows.net/content", "metadata": {}, "name": "content", - "resource_manager_id": "/subscriptions/38977b70-47bf-4da5-a492-88712fce8725/resourceGroups/rg-hub-810/providers/Microsoft.Storage/storageAccounts/storageaccgw810/blobServices/default/containers/content", + "resource_manager_id": "/subscriptions/38977b70-47bf-4da5-a492-88712fce8725/resourceGroups/rg-hub-vpngw-810/providers/Microsoft.Storage/storageAccounts/storageaccgw810/blobServices/default/containers/content", "storage_account_name": "storageaccgw810", "timeouts": null }, @@ -655,16 +655,16 @@ "schema_version": 0, "attributes": { "address_prefixes": [ - "10.0.0.0/24" + "10.0.1.0/24" ], "delegation": [], "enforce_private_link_endpoint_network_policies": false, "enforce_private_link_service_network_policies": false, - "id": "/subscriptions/38977b70-47bf-4da5-a492-88712fce8725/resourceGroups/rg-hub-810/providers/Microsoft.Network/virtualNetworks/vnet-hub-weu/subnets/GatewaySubnet", + "id": "/subscriptions/38977b70-47bf-4da5-a492-88712fce8725/resourceGroups/rg-hub-vpngw-810/providers/Microsoft.Network/virtualNetworks/vnet-hub-weu/subnets/GatewaySubnet", "name": "GatewaySubnet", "private_endpoint_network_policies_enabled": true, "private_link_service_network_policies_enabled": true, - "resource_group_name": "rg-hub-810", + "resource_group_name": "rg-hub-vpngw-810", "service_endpoint_policy_ids": [], "service_endpoints": [], "timeouts": null, @@ -689,16 +689,16 @@ "schema_version": 0, "attributes": { "address_prefixes": [ - "10.0.2.0/24" + "10.0.0.0/24" ], "delegation": [], "enforce_private_link_endpoint_network_policies": false, "enforce_private_link_service_network_policies": false, - "id": "/subscriptions/38977b70-47bf-4da5-a492-88712fce8725/resourceGroups/rg-hub-810/providers/Microsoft.Network/virtualNetworks/vnet-hub-weu/subnets/subnet-vm", + "id": "/subscriptions/38977b70-47bf-4da5-a492-88712fce8725/resourceGroups/rg-hub-vpngw-810/providers/Microsoft.Network/virtualNetworks/vnet-hub-weu/subnets/subnet-vm", "name": "subnet-vm", "private_endpoint_network_policies_enabled": true, "private_link_service_network_policies_enabled": true, - "resource_group_name": "rg-hub-810", + "resource_group_name": "rg-hub-vpngw-810", "service_endpoint_policy_ids": [], "service_endpoints": [], "timeouts": null, @@ -731,22 +731,22 @@ "edge_zone": "", "encryption": [], "flow_timeout_in_minutes": 0, - "guid": "061666b6-c437-41e7-81ff-218dec96ce53", - "id": "/subscriptions/38977b70-47bf-4da5-a492-88712fce8725/resourceGroups/rg-hub-810/providers/Microsoft.Network/virtualNetworks/vnet-hub-weu", + "guid": "0b6d6a55-f2bb-4f53-9619-4a193f1e7ed9", + "id": "/subscriptions/38977b70-47bf-4da5-a492-88712fce8725/resourceGroups/rg-hub-vpngw-810/providers/Microsoft.Network/virtualNetworks/vnet-hub-weu", "location": "westeurope", "name": "vnet-hub-weu", - "resource_group_name": "rg-hub-810", + "resource_group_name": "rg-hub-vpngw-810", "subnet": [ { "address_prefix": "10.0.0.0/24", - "id": "/subscriptions/38977b70-47bf-4da5-a492-88712fce8725/resourceGroups/rg-hub-810/providers/Microsoft.Network/virtualNetworks/vnet-hub-weu/subnets/GatewaySubnet", - "name": "GatewaySubnet", + "id": "/subscriptions/38977b70-47bf-4da5-a492-88712fce8725/resourceGroups/rg-hub-vpngw-810/providers/Microsoft.Network/virtualNetworks/vnet-hub-weu/subnets/subnet-vm", + "name": "subnet-vm", "security_group": "" }, { - "address_prefix": "10.0.2.0/24", - "id": "/subscriptions/38977b70-47bf-4da5-a492-88712fce8725/resourceGroups/rg-hub-810/providers/Microsoft.Network/virtualNetworks/vnet-hub-weu/subnets/subnet-vm", - "name": "subnet-vm", + "address_prefix": "10.0.1.0/24", + "id": "/subscriptions/38977b70-47bf-4da5-a492-88712fce8725/resourceGroups/rg-hub-vpngw-810/providers/Microsoft.Network/virtualNetworks/vnet-hub-weu/subnets/GatewaySubnet", + "name": "GatewaySubnet", "security_group": "" } ], @@ -779,13 +779,13 @@ "edge_zone": "", "enable_bgp": false, "generation": "Generation1", - "id": "/subscriptions/38977b70-47bf-4da5-a492-88712fce8725/resourceGroups/rg-hub-810/providers/Microsoft.Network/virtualNetworkGateways/vpn-gateway", + "id": "/subscriptions/38977b70-47bf-4da5-a492-88712fce8725/resourceGroups/rg-hub-vpngw-810/providers/Microsoft.Network/virtualNetworkGateways/vpn-gateway", "ip_configuration": [ { "name": "vnetGatewayConfig", "private_ip_address_allocation": "Dynamic", - "public_ip_address_id": "/subscriptions/38977b70-47bf-4da5-a492-88712fce8725/resourceGroups/rg-hub-810/providers/Microsoft.Network/publicIPAddresses/pip-vnet-gateway", - "subnet_id": "/subscriptions/38977b70-47bf-4da5-a492-88712fce8725/resourceGroups/rg-hub-810/providers/Microsoft.Network/virtualNetworks/vnet-hub-weu/subnets/GatewaySubnet" + "public_ip_address_id": "/subscriptions/38977b70-47bf-4da5-a492-88712fce8725/resourceGroups/rg-hub-vpngw-810/providers/Microsoft.Network/publicIPAddresses/pip-vnet-gateway", + "subnet_id": "/subscriptions/38977b70-47bf-4da5-a492-88712fce8725/resourceGroups/rg-hub-vpngw-810/providers/Microsoft.Network/virtualNetworks/vnet-hub-weu/subnets/GatewaySubnet" } ], "ip_sec_replay_protection_enabled": true, @@ -794,7 +794,7 @@ "policy_group": [], "private_ip_address_enabled": false, "remote_vnet_traffic_enabled": false, - "resource_group_name": "rg-hub-810", + "resource_group_name": "rg-hub-vpngw-810", "sku": "Basic", "tags": {}, "timeouts": null, @@ -806,7 +806,7 @@ "aad_issuer": "", "aad_tenant": "", "address_space": [ - "10.1.0.0/24" + "172.16.0.0/24" ], "ipsec_policy": [], "radius_server": [], @@ -889,7 +889,7 @@ "diff_disk_settings": [], "disk_encryption_set_id": "", "disk_size_gb": 30, - "name": "vm-linux-spoke1-810_disk1_fb330d0e09d349b28b9fe69217047580", + "name": "vm-linux-spoke1-810_OsDisk_1_ffae3ae7420449968cef9504347f3a72", "secure_vm_disk_encryption_set_id": "", "security_encryption_type": "", "storage_account_type": "Standard_LRS", @@ -907,9 +907,9 @@ ], "provision_vm_agent": true, "proximity_placement_group_id": "", - "public_ip_address": "4.180.202.33", + "public_ip_address": "52.166.193.254", "public_ip_addresses": [ - "4.180.202.33" + "52.166.193.254" ], "reboot_setting": "", "resource_group_name": "rg-spoke1-810", @@ -925,11 +925,11 @@ "version": "latest" } ], - "tags": {}, - "termination_notification": [], + "tags": null, + "termination_notification": null, "timeouts": null, "user_data": "", - "virtual_machine_id": "3890346a-50d4-4e3e-b166-03b9aca8b9dd", + "virtual_machine_id": "6bb3949f-fb7c-4943-8cb9-44a9c97495f8", "virtual_machine_scale_set_id": "", "vtpm_enabled": false, "zone": "" @@ -966,7 +966,7 @@ "enable_ip_forwarding": false, "id": "/subscriptions/38977b70-47bf-4da5-a492-88712fce8725/resourceGroups/rg-spoke1-810/providers/Microsoft.Network/networkInterfaces/nic-vm", "internal_dns_name_label": "", - "internal_domain_name_suffix": "r0krpzusrtmubkeosqlem4tsad.ax.internal.cloudapp.net", + "internal_domain_name_suffix": "0rd4xkv2jplebn5qfholqzgqze.ax.internal.cloudapp.net", "ip_configuration": [ { "gateway_load_balancer_frontend_ip_configuration_id": "", @@ -980,16 +980,16 @@ } ], "location": "westeurope", - "mac_address": "60-45-BD-8E-20-E1", + "mac_address": "", "name": "nic-vm", "private_ip_address": "10.1.0.4", "private_ip_addresses": [ "10.1.0.4" ], "resource_group_name": "rg-spoke1-810", - "tags": {}, + "tags": null, "timeouts": null, - "virtual_machine_id": "/subscriptions/38977b70-47bf-4da5-a492-88712fce8725/resourceGroups/rg-spoke1-810/providers/Microsoft.Compute/virtualMachines/vm-linux-spoke1-810" + "virtual_machine_id": "" }, "sensitive_attributes": [], "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjoxODAwMDAwMDAwMDAwLCJkZWxldGUiOjE4MDAwMDAwMDAwMDAsInJlYWQiOjMwMDAwMDAwMDAwMCwidXBkYXRlIjoxODAwMDAwMDAwMDAwfX0=", @@ -1021,8 +1021,8 @@ "fqdn": null, "id": "/subscriptions/38977b70-47bf-4da5-a492-88712fce8725/resourceGroups/rg-spoke1-810/providers/Microsoft.Network/publicIPAddresses/pip-vm", "idle_timeout_in_minutes": 4, - "ip_address": "4.180.202.33", - "ip_tags": {}, + "ip_address": "", + "ip_tags": null, "ip_version": "IPv4", "location": "westeurope", "name": "pip-vm", @@ -1031,9 +1031,9 @@ "reverse_fqdn": null, "sku": "Basic", "sku_tier": "Regional", - "tags": {}, + "tags": null, "timeouts": null, - "zones": [] + "zones": null }, "sensitive_attributes": [], "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjoxODAwMDAwMDAwMDAwLCJkZWxldGUiOjE4MDAwMDAwMDAwMDAsInJlYWQiOjMwMDAwMDAwMDAwMCwidXBkYXRlIjoxODAwMDAwMDAwMDAwfX0=", @@ -1058,7 +1058,7 @@ "location": "westeurope", "managed_by": "", "name": "rg-spoke1-810", - "tags": {}, + "tags": null, "timeouts": null }, "sensitive_attributes": [], @@ -1090,8 +1090,8 @@ "private_endpoint_network_policies_enabled": true, "private_link_service_network_policies_enabled": true, "resource_group_name": "rg-spoke1-810", - "service_endpoint_policy_ids": [], - "service_endpoints": [], + "service_endpoint_policy_ids": null, + "service_endpoints": null, "timeouts": null, "virtual_network_name": "vnet-spoke1-810" }, @@ -1124,20 +1124,13 @@ "edge_zone": "", "encryption": [], "flow_timeout_in_minutes": 0, - "guid": "e617958e-8c92-40d9-a88e-9416467a7203", + "guid": "aaeb47d4-4bbc-40d6-b7f0-29dcb864d0cc", "id": "/subscriptions/38977b70-47bf-4da5-a492-88712fce8725/resourceGroups/rg-spoke1-810/providers/Microsoft.Network/virtualNetworks/vnet-spoke1-810", "location": "westeurope", "name": "vnet-spoke1-810", "resource_group_name": "rg-spoke1-810", - "subnet": [ - { - "address_prefix": "10.1.0.0/24", - "id": "/subscriptions/38977b70-47bf-4da5-a492-88712fce8725/resourceGroups/rg-spoke1-810/providers/Microsoft.Network/virtualNetworks/vnet-spoke1-810/subnets/subnet-vm", - "name": "subnet-vm", - "security_group": "" - } - ], - "tags": {}, + "subnet": [], + "tags": null, "timeouts": null }, "sensitive_attributes": [], @@ -1162,10 +1155,10 @@ "allow_forwarded_traffic": true, "allow_gateway_transit": true, "allow_virtual_network_access": true, - "id": "/subscriptions/38977b70-47bf-4da5-a492-88712fce8725/resourceGroups/rg-hub-810/providers/Microsoft.Network/virtualNetworks/vnet-hub-weu/virtualNetworkPeerings/peering-hub-to-spoke1-810", + "id": "/subscriptions/38977b70-47bf-4da5-a492-88712fce8725/resourceGroups/rg-hub-vpngw-810/providers/Microsoft.Network/virtualNetworks/vnet-hub-weu/virtualNetworkPeerings/peering-hub-to-spoke1-810", "name": "peering-hub-to-spoke1-810", "remote_virtual_network_id": "/subscriptions/38977b70-47bf-4da5-a492-88712fce8725/resourceGroups/rg-spoke1-810/providers/Microsoft.Network/virtualNetworks/vnet-spoke1-810", - "resource_group_name": "rg-hub-810", + "resource_group_name": "rg-hub-vpngw-810", "timeouts": null, "triggers": null, "use_remote_gateways": false, @@ -1197,7 +1190,7 @@ "allow_virtual_network_access": true, "id": "/subscriptions/38977b70-47bf-4da5-a492-88712fce8725/resourceGroups/rg-spoke1-810/providers/Microsoft.Network/virtualNetworks/vnet-spoke1-810/virtualNetworkPeerings/peering-spoke1-810-to-hub", "name": "peering-spoke1-810-to-hub", - "remote_virtual_network_id": "/subscriptions/38977b70-47bf-4da5-a492-88712fce8725/resourceGroups/rg-hub-810/providers/Microsoft.Network/virtualNetworks/vnet-hub-weu", + "remote_virtual_network_id": "/subscriptions/38977b70-47bf-4da5-a492-88712fce8725/resourceGroups/rg-hub-vpngw-810/providers/Microsoft.Network/virtualNetworks/vnet-hub-weu", "resource_group_name": "rg-spoke1-810", "timeouts": null, "triggers": null, @@ -1263,7 +1256,7 @@ "diff_disk_settings": [], "disk_encryption_set_id": "", "disk_size_gb": 30, - "name": "vm-linux-spoke2-810_OsDisk_1_e69c716d611c41d3acc77acaa7a98a55", + "name": "vm-linux-spoke2-810_OsDisk_1_d20d2eb6fc224aca9272492b96716c67", "secure_vm_disk_encryption_set_id": "", "security_encryption_type": "", "storage_account_type": "Standard_LRS", @@ -1281,9 +1274,9 @@ ], "provision_vm_agent": true, "proximity_placement_group_id": "", - "public_ip_address": "4.180.201.177", + "public_ip_address": "13.94.137.224", "public_ip_addresses": [ - "4.180.201.177" + "13.94.137.224" ], "reboot_setting": "", "resource_group_name": "rg-spoke2-810", @@ -1299,11 +1292,11 @@ "version": "latest" } ], - "tags": {}, - "termination_notification": [], + "tags": null, + "termination_notification": null, "timeouts": null, "user_data": "", - "virtual_machine_id": "ff149598-4367-4c0e-a642-a57f5c013719", + "virtual_machine_id": "6c68bf42-0d40-44ec-95b7-cbcf0dbcc16d", "virtual_machine_scale_set_id": "", "vtpm_enabled": false, "zone": "" @@ -1340,7 +1333,7 @@ "enable_ip_forwarding": false, "id": "/subscriptions/38977b70-47bf-4da5-a492-88712fce8725/resourceGroups/rg-spoke2-810/providers/Microsoft.Network/networkInterfaces/nic-vm", "internal_dns_name_label": "", - "internal_domain_name_suffix": "hcqaesctsdpexfp3023a3tidma.ax.internal.cloudapp.net", + "internal_domain_name_suffix": "epwevkqbqyyuljalanp55ya5qh.ax.internal.cloudapp.net", "ip_configuration": [ { "gateway_load_balancer_frontend_ip_configuration_id": "", @@ -1354,16 +1347,16 @@ } ], "location": "westeurope", - "mac_address": "60-45-BD-88-9C-B5", + "mac_address": "", "name": "nic-vm", "private_ip_address": "10.2.0.4", "private_ip_addresses": [ "10.2.0.4" ], "resource_group_name": "rg-spoke2-810", - "tags": {}, + "tags": null, "timeouts": null, - "virtual_machine_id": "/subscriptions/38977b70-47bf-4da5-a492-88712fce8725/resourceGroups/rg-spoke2-810/providers/Microsoft.Compute/virtualMachines/vm-linux-spoke2-810" + "virtual_machine_id": "" }, "sensitive_attributes": [], "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjoxODAwMDAwMDAwMDAwLCJkZWxldGUiOjE4MDAwMDAwMDAwMDAsInJlYWQiOjMwMDAwMDAwMDAwMCwidXBkYXRlIjoxODAwMDAwMDAwMDAwfX0=", @@ -1395,8 +1388,8 @@ "fqdn": null, "id": "/subscriptions/38977b70-47bf-4da5-a492-88712fce8725/resourceGroups/rg-spoke2-810/providers/Microsoft.Network/publicIPAddresses/pip-vm", "idle_timeout_in_minutes": 4, - "ip_address": "4.180.201.177", - "ip_tags": {}, + "ip_address": "", + "ip_tags": null, "ip_version": "IPv4", "location": "westeurope", "name": "pip-vm", @@ -1405,9 +1398,9 @@ "reverse_fqdn": null, "sku": "Basic", "sku_tier": "Regional", - "tags": {}, + "tags": null, "timeouts": null, - "zones": [] + "zones": null }, "sensitive_attributes": [], "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjoxODAwMDAwMDAwMDAwLCJkZWxldGUiOjE4MDAwMDAwMDAwMDAsInJlYWQiOjMwMDAwMDAwMDAwMCwidXBkYXRlIjoxODAwMDAwMDAwMDAwfX0=", @@ -1432,7 +1425,7 @@ "location": "westeurope", "managed_by": "", "name": "rg-spoke2-810", - "tags": {}, + "tags": null, "timeouts": null }, "sensitive_attributes": [], @@ -1464,8 +1457,8 @@ "private_endpoint_network_policies_enabled": true, "private_link_service_network_policies_enabled": true, "resource_group_name": "rg-spoke2-810", - "service_endpoint_policy_ids": [], - "service_endpoints": [], + "service_endpoint_policy_ids": null, + "service_endpoints": null, "timeouts": null, "virtual_network_name": "vnet-spoke2-810" }, @@ -1498,20 +1491,13 @@ "edge_zone": "", "encryption": [], "flow_timeout_in_minutes": 0, - "guid": "4802a038-9053-4bde-95fd-d73a0ecd0360", + "guid": "aa4aec23-8601-4531-a40b-035fffe01f87", "id": "/subscriptions/38977b70-47bf-4da5-a492-88712fce8725/resourceGroups/rg-spoke2-810/providers/Microsoft.Network/virtualNetworks/vnet-spoke2-810", "location": "westeurope", "name": "vnet-spoke2-810", "resource_group_name": "rg-spoke2-810", - "subnet": [ - { - "address_prefix": "10.2.0.0/24", - "id": "/subscriptions/38977b70-47bf-4da5-a492-88712fce8725/resourceGroups/rg-spoke2-810/providers/Microsoft.Network/virtualNetworks/vnet-spoke2-810/subnets/subnet-vm", - "name": "subnet-vm", - "security_group": "" - } - ], - "tags": {}, + "subnet": [], + "tags": null, "timeouts": null }, "sensitive_attributes": [], @@ -1536,10 +1522,10 @@ "allow_forwarded_traffic": true, "allow_gateway_transit": false, "allow_virtual_network_access": true, - "id": "/subscriptions/38977b70-47bf-4da5-a492-88712fce8725/resourceGroups/rg-hub-810/providers/Microsoft.Network/virtualNetworks/vnet-hub-weu/virtualNetworkPeerings/peering-hub-to-spoke2-810", + "id": "/subscriptions/38977b70-47bf-4da5-a492-88712fce8725/resourceGroups/rg-hub-vpngw-810/providers/Microsoft.Network/virtualNetworks/vnet-hub-weu/virtualNetworkPeerings/peering-hub-to-spoke2-810", "name": "peering-hub-to-spoke2-810", "remote_virtual_network_id": "/subscriptions/38977b70-47bf-4da5-a492-88712fce8725/resourceGroups/rg-spoke2-810/providers/Microsoft.Network/virtualNetworks/vnet-spoke2-810", - "resource_group_name": "rg-hub-810", + "resource_group_name": "rg-hub-vpngw-810", "timeouts": null, "triggers": null, "use_remote_gateways": false, @@ -1571,7 +1557,7 @@ "allow_virtual_network_access": true, "id": "/subscriptions/38977b70-47bf-4da5-a492-88712fce8725/resourceGroups/rg-spoke2-810/providers/Microsoft.Network/virtualNetworks/vnet-spoke2-810/virtualNetworkPeerings/peering-spoke2-810-to-hub", "name": "peering-spoke2-810-to-hub", - "remote_virtual_network_id": "/subscriptions/38977b70-47bf-4da5-a492-88712fce8725/resourceGroups/rg-hub-810/providers/Microsoft.Network/virtualNetworks/vnet-hub-weu", + "remote_virtual_network_id": "/subscriptions/38977b70-47bf-4da5-a492-88712fce8725/resourceGroups/rg-hub-vpngw-810/providers/Microsoft.Network/virtualNetworks/vnet-hub-weu", "resource_group_name": "rg-spoke2-810", "timeouts": null, "triggers": null, diff --git a/810_onprem_vpn_gateway_p2s_hub_spokes/vnet-hub.tf b/810_onprem_vpn_gateway_p2s_hub_spokes/vnet-hub.tf index 28c36ba..3be15bc 100644 --- a/810_onprem_vpn_gateway_p2s_hub_spokes/vnet-hub.tf +++ b/810_onprem_vpn_gateway_p2s_hub_spokes/vnet-hub.tf @@ -7,16 +7,16 @@ resource "azurerm_virtual_network" "vnet-hub" { } -resource "azurerm_subnet" "subnet-gateway" { - name = "GatewaySubnet" +resource "azurerm_subnet" "subnet-vm" { + name = "subnet-vm" resource_group_name = azurerm_virtual_network.vnet-hub.resource_group_name virtual_network_name = azurerm_virtual_network.vnet-hub.name address_prefixes = ["10.0.0.0/24"] } -resource "azurerm_subnet" "subnet-vm" { - name = "subnet-vm" +resource "azurerm_subnet" "subnet-gateway" { + name = "GatewaySubnet" resource_group_name = azurerm_virtual_network.vnet-hub.resource_group_name virtual_network_name = azurerm_virtual_network.vnet-hub.name - address_prefixes = ["10.0.2.0/24"] + address_prefixes = ["10.0.1.0/24"] } \ No newline at end of file diff --git a/810_onprem_vpn_gateway_p2s_hub_spokes/vpn_gateway.tf b/810_onprem_vpn_gateway_p2s_hub_spokes/vpn_gateway.tf index 80b629e..1758d48 100644 --- a/810_onprem_vpn_gateway_p2s_hub_spokes/vpn_gateway.tf +++ b/810_onprem_vpn_gateway_p2s_hub_spokes/vpn_gateway.tf @@ -29,7 +29,7 @@ resource "azurerm_virtual_network_gateway" "vpn-gateway" { } vpn_client_configuration { - address_space = ["10.1.0.0/24"] + address_space = ["172.16.0.0/24"] root_certificate { name = "P2SRootCert800"