Merge branch 'stackhpc/2025.1' into bump-kayobe-automation

Author: m-bull

etc/kayobe/ansible/check-kayobe-version.yml

@@ -7,13 +7,26 @@
     requirements_path: "{{ kayobe_config_path }}/../../requirements.txt"
   tasks:
     - name: Check version
-      when: stackhpc_enable_kayobe_check
+      when: stackhpc_enable_kayobe_check | bool
       check_mode: false
       block:
         - name: Get package info
           community.general.pip_package_info:
           register: packages
 
+        - name: Check if Kayobe is installed as editable
+          ansible.builtin.assert:
+            that: packages.packages.pip.kayobe[0].editable_project_location is not defined
+            fail_msg: |
+              You are using Kayobe as an editable install. Please recreate the
+              Kayobe environment, or reinstall Kayobe by running:
+              pip install --force-reinstall -r {{ requirements_path }}
+
+              If an editable install is actually required, you can skip this
+              check by setting stackhpc_enable_kayobe_check to false.
+            success_msg: |
+              Kayobe is not installed as editable.
+
         - name: Check if pip is version 24.0 or newer
           ansible.builtin.assert:
             that: "{{ packages.packages.pip.pip[0].version is version('24.0', '>=') }}"

etc/kayobe/ansible/check-kolla-ansible-version.yml

@@ -5,7 +5,7 @@
   gather_facts: false
   tasks:
     - name: Check version
-      when: stackhpc_enable_kolla_ansible_check
+      when: stackhpc_enable_kolla_ansible_check | bool
       check_mode: false
       block:
         - name: Get current Kolla-Ansible tag

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

etc/kayobe/stackhpc-compute.yml

@@ -101,3 +101,15 @@ stackhpc_gpu_data:
     vendor_id: "10de"
     product_id: "26b9"
     device_type: "type-PF"
+  # Nvidia A30
+  a30:
+    resource_name: "{{ a30_resource_name | default('a30') }}"
+    vendor_id: "10de"
+    product_id: "20b7"
+    device_type: "type-PF"
+  # Nvidia H100L
+  h100l:
+    resource_name: "{{ h100l_resource_name | default('h100l') }}"
+    vendor_id: "10de"
+    product_id: "2321"
+    device_type: "type-PF"

releasenotes/notes/add-a30-h100l-a016f8ff0939eb37.yaml

@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    Add definitions for ``NVIDIA A30`` and ``NVIDIA H100L`` to the
+    ``stackhpc_gpu_data`` for easy deployment of such GPUs.