scottk/terraform-talos
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/terraform-talos.git synced 2025-11-01 02:38:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Switch router on

Browse Source
This commit is contained in:
Serge Logvinov
2022-05-10 10:01:02 +03:00
parent 773015678f
commit 0f629f6cd7
4 changed files with 22 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
openstack/common.tf
View File

@@ -4,7 +4,7 @@ data "openstack_identity_auth_scope_v3" "scope" {
} }
locals { locals {
project_domain_name = data.openstack_identity_auth_scope_v3.scope.project_domain_name project_domain_id = data.openstack_identity_auth_scope_v3.scope.project_domain_id
project_id = data.openstack_identity_auth_scope_v3.scope.project_id project_id = data.openstack_identity_auth_scope_v3.scope.project_id
openstack_auth_identity = [for entry in data.openstack_identity_auth_scope_v3.scope.service_catalog : openstack_auth_identity = [for entry in data.openstack_identity_auth_scope_v3.scope.service_catalog :

2
openstack/instances-master.tf
View File

@@ -23,7 +23,7 @@ module "controlplane" {
region = each.key region = each.key
auth = local.openstack_auth_url auth = local.openstack_auth_url
project_id = local.project_id project_id = local.project_id
project_domain_name = local.project_domain_name project_domain_id = local.project_domain_id
network_public_name = local.network_external[each.key].name network_public_name = local.network_external[each.key].name
}) })

38
openstack/prepare/network-gw.tf
View File

@@ -6,19 +6,18 @@ data "openstack_networking_network_v2" "external" {
external = true external = true
} }
# resource "openstack_networking_router_v2" "gw" { resource "openstack_networking_router_v2" "gw" {
# for_each = { for idx, name in var.regions : name => idx if try(var.capabilities[name].gateway, false) } for_each = { for idx, name in var.regions : name => idx if try(var.capabilities[name].gateway, false) }
# region = each.key region = each.key
# name = openstack_networking_subnet_v2.private[each.key].name name = openstack_networking_subnet_v2.private[each.key].name
# admin_state_up = true external_network_id = data.openstack_networking_network_v2.external[each.key].id
# # enable_snat = true admin_state_up = true
# external_network_id = data.openstack_networking_network_v2.external[each.key].id
# # external_fixed_ip { # external_fixed_ip {
# # subnet_id = data.openstack_networking_network_v2.external[each.key].id # subnet_id = data.openstack_networking_network_v2.external[each.key].id
# # ip_address = [for k in openstack_networking_port_v2.gw_external[each.key].all_fixed_ips : k if length(regexall("[0-9.]+", k)) > 0][0] # ip_address = [for k in openstack_networking_port_v2.gw_external[each.key].all_fixed_ips : k if length(regexall("[0-9.]+", k)) > 0][0]
# # } # }
# } }
resource "openstack_networking_port_v2" "gw_external" { resource "openstack_networking_port_v2" "gw_external" {
for_each = { for idx, name in var.regions : name => idx if try(var.capabilities[name].gateway, false) == false } for_each = { for idx, name in var.regions : name => idx if try(var.capabilities[name].gateway, false) == false }
@@ -52,14 +51,13 @@ resource "openstack_networking_port_v2" "gw_private" {
} }
} }
# resource "openstack_networking_router_interface_v2" "private" { resource "openstack_networking_router_interface_v2" "private" {
# for_each = { for idx, name in var.regions : name => idx if try(var.capabilities[name].gateway, false) } for_each = { for idx, name in var.regions : name => idx if try(var.capabilities[name].gateway, false) }
# region = each.key region = each.key
# router_id = openstack_networking_router_v2.gw[each.key].id router_id = openstack_networking_router_v2.gw[each.key].id
# port_id = openstack_networking_port_v2.gw[each.key].id subnet_id = openstack_networking_subnet_v2.private[each.key].id
port_id = openstack_networking_port_v2.gw_private[each.key].id
# # subnet_id = openstack_networking_subnet_v2.private[each.key].id }
# }
### Soft gateway ### Soft gateway

2
openstack/templates/controlplane.yaml.tpl
View File

@@ -88,7 +88,7 @@ cluster:
region=${region} region=${region}
auth-url=${auth}v3/ auth-url=${auth}v3/
tenant-id=${project_id} tenant-id=${project_id}
domain-name=${project_domain_name} domain-id=${project_domain_id}
[Networking] [Networking]
public-network-name=${network_public_name} public-network-name=${network_public_name}
externalCloudProvider: externalCloudProvider: