From 2eedcf0b9980ec640fb659828f79e2bcb4fc01b9 Mon Sep 17 00:00:00 2001
From: Michal Nasiadka <mnasiadka@gmail.com>
Date: Wed, 10 Sep 2025 11:51:50 +0200
Subject: [PATCH 1/2] Fix overriding nova config files when gpu_group_map is
 unset

---
 etc/kayobe/kolla/config/nova/nova-api.conf       | 4 +++-
 etc/kayobe/kolla/config/nova/nova-compute.conf   | 2 ++
 etc/kayobe/kolla/config/nova/nova-scheduler.conf | 2 ++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/etc/kayobe/kolla/config/nova/nova-api.conf b/etc/kayobe/kolla/config/nova/nova-api.conf
index ba96a2ddbf..035721d90a 100644
--- a/etc/kayobe/kolla/config/nova/nova-api.conf
+++ b/etc/kayobe/kolla/config/nova/nova-api.conf
@@ -1,4 +1,6 @@
+{% if gpu_group_map | default({}) %}
 [pci]
-{% for item in (gpu_group_map | default({})) | dict2items | map(attribute='value') | flatten | unique | list %}
+{% for item in (gpu_group_map | dict2items | map(attribute='value') | flatten | unique | list %}
 alias = { "vendor_id":"{{ stackhpc_gpu_data[item].vendor_id }}", "product_id":"{{ stackhpc_gpu_data[item].product_id }}", "device_type":"{{ stackhpc_gpu_data[item].device_type }}", "name":"{{ stackhpc_gpu_data[item].resource_name }}" }
 {% endfor %}
+{% endif %}
diff --git a/etc/kayobe/kolla/config/nova/nova-compute.conf b/etc/kayobe/kolla/config/nova/nova-compute.conf
index ed83c7101f..1e92469814 100644
--- a/etc/kayobe/kolla/config/nova/nova-compute.conf
+++ b/etc/kayobe/kolla/config/nova/nova-compute.conf
@@ -1,3 +1,4 @@
+{% if gpu_group_map | default({}) %}
 [pci]
 {% raw %}
 {% set gpu_list = [] %}
@@ -11,3 +12,4 @@ device_spec = { "vendor_id":"{{ stackhpc_gpu_data[item].vendor_id }}", "product_
 alias = { "vendor_id":"{{ stackhpc_gpu_data[item].vendor_id }}", "product_id":"{{ stackhpc_gpu_data[item].product_id }}", "device_type":"{{ stackhpc_gpu_data[item].device_type }}", "name":"{{ stackhpc_gpu_data[item].resource_name }}" }
 {% endfor %}
 {% endraw %}
+{% endif %}
diff --git a/etc/kayobe/kolla/config/nova/nova-scheduler.conf b/etc/kayobe/kolla/config/nova/nova-scheduler.conf
index f41bd8548d..e34485c97e 100644
--- a/etc/kayobe/kolla/config/nova/nova-scheduler.conf
+++ b/etc/kayobe/kolla/config/nova/nova-scheduler.conf
@@ -1,3 +1,4 @@
+{% if gpu_group_map | default({}) %}
 [filter_scheduler]
 # Default list plus PciPassthroughFilter
 # NOTE(Upgrade): defaults may change in each release. Default values can be
@@ -5,3 +6,4 @@
 # https://docs.openstack.org/nova/latest/configuration/sample-config.html
 enabled_filters = ComputeFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,ServerGroupAntiAffinityFilter,ServerGroupAffinityFilter,PciPassthroughFilter
 available_filters = nova.scheduler.filters.all_filters
+{% endif %}

From 6130e53eb689a271e47808cecd2b6d30be2bf9f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Nasiadka?= <michal@stackhpc.com>
Date: Fri, 12 Sep 2025 11:51:53 +0200
Subject: [PATCH 2/2] Update etc/kayobe/kolla/config/nova/nova-api.conf

Co-authored-by: Alex Welsh <112560678+Alex-Welsh@users.noreply.github.com>
---
 etc/kayobe/kolla/config/nova/nova-api.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etc/kayobe/kolla/config/nova/nova-api.conf b/etc/kayobe/kolla/config/nova/nova-api.conf
index 035721d90a..7e2ef07ff3 100644
--- a/etc/kayobe/kolla/config/nova/nova-api.conf
+++ b/etc/kayobe/kolla/config/nova/nova-api.conf
@@ -1,6 +1,6 @@
 {% if gpu_group_map | default({}) %}
 [pci]
-{% for item in (gpu_group_map | dict2items | map(attribute='value') | flatten | unique | list %}
+{% for item in gpu_group_map | dict2items | map(attribute='value') | flatten | unique | list %}
 alias = { "vendor_id":"{{ stackhpc_gpu_data[item].vendor_id }}", "product_id":"{{ stackhpc_gpu_data[item].product_id }}", "device_type":"{{ stackhpc_gpu_data[item].device_type }}", "name":"{{ stackhpc_gpu_data[item].resource_name }}" }
 {% endfor %}
 {% endif %}