From efda28df59edde6c8e76798068e1697db114937f Mon Sep 17 00:00:00 2001
From: Serge Logvinov <serge.logvinov@sinextra.dev>
Date: Sat, 2 Nov 2024 22:26:25 +0200
Subject: [PATCH] fix numa index

---
 proxmox/common.tf                 | 2 +-
 proxmox/instances-controlplane.tf | 2 +-
 proxmox/instances-db.tf           | 2 +-
 proxmox/instances-web.tf          | 2 +-
 proxmox/instances-worker.tf       | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/proxmox/common.tf b/proxmox/common.tf
index 59acf63..57b4066 100644
--- a/proxmox/common.tf
+++ b/proxmox/common.tf
@@ -41,7 +41,7 @@ resource "proxmox_virtual_environment_vm" "template" {
 
   tablet_device = false
 
-  machine = "pc"
+  machine = "q35"
   cpu {
     architecture = "x86_64"
     cores        = 1
diff --git a/proxmox/instances-controlplane.tf b/proxmox/instances-controlplane.tf
index 4cd3c8a..a8dc694 100644
--- a/proxmox/instances-controlplane.tf
+++ b/proxmox/instances-controlplane.tf
@@ -57,7 +57,7 @@ resource "proxmox_virtual_environment_vm" "controlplane" {
   vm_id       = each.value.id
   description = "Talos controlplane at ${var.region}"
 
-  machine = "pc"
+  machine = "q35"
   cpu {
     architecture = "x86_64"
     cores        = each.value.cpu
diff --git a/proxmox/instances-db.tf b/proxmox/instances-db.tf
index 72b60b3..fbac78e 100644
--- a/proxmox/instances-db.tf
+++ b/proxmox/instances-db.tf
@@ -109,7 +109,7 @@ resource "proxmox_virtual_environment_vm" "db" {
   dynamic "numa" {
     for_each = { for idx, numa in module.db_affinity[each.value.zone].arch[each.value.inx].numa : idx => {
       device = "numa${index(keys(module.db_affinity[each.value.zone].arch[each.value.inx].numa), idx)}"
-      cpus   = "${idx * (each.value.cpu / length(module.db_affinity[each.value.zone].arch[each.value.inx].numa))}-${(idx + 1) * (each.value.cpu / length(module.db_affinity[each.value.zone].arch[each.value.inx].numa)) - 1}"
+      cpus   = "${index(keys(module.db_affinity[each.value.zone].arch[each.value.inx].numa), idx) * (each.value.cpu / length(module.db_affinity[each.value.zone].arch[each.value.inx].numa))}-${(index(keys(module.db_affinity[each.value.zone].arch[each.value.inx].numa), idx) + 1) * (each.value.cpu / length(module.db_affinity[each.value.zone].arch[each.value.inx].numa)) - 1}"
       mem    = each.value.mem / length(module.db_affinity[each.value.zone].arch[each.value.inx].numa)
     } }
     content {
diff --git a/proxmox/instances-web.tf b/proxmox/instances-web.tf
index 883e624..a0bc160 100644
--- a/proxmox/instances-web.tf
+++ b/proxmox/instances-web.tf
@@ -130,7 +130,7 @@ resource "proxmox_virtual_environment_vm" "web" {
   dynamic "numa" {
     for_each = { for idx, numa in module.web_affinity[each.value.zone].arch[each.value.inx].numa : idx => {
       device = "numa${index(keys(module.web_affinity[each.value.zone].arch[each.value.inx].numa), idx)}"
-      cpus   = "${idx * (each.value.cpu / length(module.web_affinity[each.value.zone].arch[each.value.inx].numa))}-${(idx + 1) * (each.value.cpu / length(module.web_affinity[each.value.zone].arch[each.value.inx].numa)) - 1}"
+      cpus   = "${index(keys(module.web_affinity[each.value.zone].arch[each.value.inx].numa), idx) * (each.value.cpu / length(module.web_affinity[each.value.zone].arch[each.value.inx].numa))}-${(index(keys(module.web_affinity[each.value.zone].arch[each.value.inx].numa), idx) + 1) * (each.value.cpu / length(module.web_affinity[each.value.zone].arch[each.value.inx].numa)) - 1}"
       mem    = each.value.mem / length(module.web_affinity[each.value.zone].arch[each.value.inx].numa)
     } }
     content {
diff --git a/proxmox/instances-worker.tf b/proxmox/instances-worker.tf
index a7806f0..2a367b3 100644
--- a/proxmox/instances-worker.tf
+++ b/proxmox/instances-worker.tf
@@ -108,7 +108,7 @@ resource "proxmox_virtual_environment_vm" "worker" {
   dynamic "numa" {
     for_each = { for idx, numa in module.worker_affinity[each.value.zone].arch[each.value.inx].numa : idx => {
       device = "numa${index(keys(module.worker_affinity[each.value.zone].arch[each.value.inx].numa), idx)}"
-      cpus   = "${idx * (each.value.cpu / length(module.worker_affinity[each.value.zone].arch[each.value.inx].numa))}-${(idx + 1) * (each.value.cpu / length(module.worker_affinity[each.value.zone].arch[each.value.inx].numa)) - 1}"
+      cpus   = "${index(keys(module.worker_affinity[each.value.zone].arch[each.value.inx].numa), idx) * (each.value.cpu / length(module.worker_affinity[each.value.zone].arch[each.value.inx].numa))}-${(index(keys(module.worker_affinity[each.value.zone].arch[each.value.inx].numa), idx) + 1) * (each.value.cpu / length(module.worker_affinity[each.value.zone].arch[each.value.inx].numa)) - 1}"
       mem    = each.value.mem / length(module.worker_affinity[each.value.zone].arch[each.value.inx].numa)
     } }
     content {