Fix overriding nova config files when gpu_group_map is unset (#1879)

* Fix overriding nova config files when gpu_group_map is unset

* Update etc/kayobe/kolla/config/nova/nova-api.conf

Co-authored-by: Alex Welsh <[email protected]>

---------

Co-authored-by: Alex Welsh <[email protected]>

Author: mnasiadka

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 %}

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 %}

etc/kayobe/kolla/config/nova/nova-scheduler.conf

@@ -1,7 +1,9 @@
+{% if gpu_group_map | default({}) %}
 [filter_scheduler]
 # Default list plus PciPassthroughFilter
 # NOTE(Upgrade): defaults may change in each release. Default values can be
 # checked here:
 # 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 %}