fix: use ip address map indexed by server key #4

Merged
xoxys merged 1 commits from fix-local-addresses into main 2024-03-20 21:45:09 +00:00
2 changed files with 10 additions and 11 deletions
Showing only changes of commit 2762c5a91a - Show all commits

14
main.tf
View File

@ -1,20 +1,20 @@
locals { locals {
ipv4_addresses = flatten([ ipv4_addresses = {
for server_key, server in var.server : [ for server_key, server in var.server : server.name => flatten([
for k, v in coalescelist(proxmox_virtual_environment_vm.server[server.name].ipv4_addresses, []) : for k, v in coalescelist(proxmox_virtual_environment_vm.server[server.name].ipv4_addresses, []) :
v if length(regexall("^(lo|docker|veth).*", proxmox_virtual_environment_vm.server[server.name].network_interface_names[k])) == 0 v if length(regexall("^(lo|docker|veth).*", proxmox_virtual_environment_vm.server[server.name].network_interface_names[k])) == 0
]
]) ])
} }
}
locals { locals {
ipv6_addresses = flatten([ ipv6_addresses = {
for server_key, server in var.server : [ for server_key, server in var.server : server.name => flatten([
for k, v in coalescelist(proxmox_virtual_environment_vm.server[server.name].ipv6_addresses, []) : for k, v in coalescelist(proxmox_virtual_environment_vm.server[server.name].ipv6_addresses, []) :
v if length(regexall("^(lo|docker|veth).*", proxmox_virtual_environment_vm.server[server.name].network_interface_names[k])) == 0 v if length(regexall("^(lo|docker|veth).*", proxmox_virtual_environment_vm.server[server.name].network_interface_names[k])) == 0
]
]) ])
} }
}
resource "proxmox_virtual_environment_vm" "server" { resource "proxmox_virtual_environment_vm" "server" {
for_each = { for row in var.server : row.name => row } for_each = { for row in var.server : row.name => row }
@ -113,7 +113,7 @@ resource "restapi_object" "ucs_server" {
"position" : var.ucs_zones[try(each.value.dns_zone, var.server_dns_zone)], "position" : var.ucs_zones[try(each.value.dns_zone, var.server_dns_zone)],
"properties" : { "properties" : {
"name" : each.value.name, "name" : each.value.name,
"a" : concat(local.ipv4_addresses, local.ipv6_addresses), "a" : concat(local.ipv4_addresses[each.key]),
} }
}) })
} }

View File

@ -2,8 +2,7 @@ output "output" {
value = { value = {
for server_key, server in proxmox_virtual_environment_vm.server : server_key => merge( for server_key, server in proxmox_virtual_environment_vm.server : server_key => merge(
server, server,
{ ipv4_addresses = local.ipv4_addresses }, { ipv4_addresses = local.ipv4_addresses[server_key] },
{ ipv6_addresses = local.ipv6_addresses }
) )
} }
} }