Merge remote-tracking branch 'origin/main' into ci/enable-linting

Author: maxstack

ansible/.gitignore

@@ -96,3 +96,5 @@ roles/*
 !roles/nhc/**
 !roles/eessi/
 !roles/eessi/**
+!roles/topology/
+!roles/topology/**

ansible/roles/proxy/tasks/main.yml

@@ -1,9 +1,10 @@
 - name: Validate http_proxy definition
   ansible.builtin.assert:
-    that: proxy_http_proxy != '' # this is default if squid not active
+    that: proxy_http_proxy != ''
     fail_msg: >-
       Variable proxy_http_proxy cannot be the empty string for hosts in the
-      proxy group. See environment/common/inventory/group_vars/all/proxy.yml.
+      proxy group. See environments/common/inventory/group_vars/all/proxy.yml
+      for convenience variables to set this.
 - name: Define configuration in /etc/environment
   tags: proxy
   ansible.builtin.lineinfile:

ansible/roles/topology/README.md

@@ -0,0 +1,33 @@
+topology
+========
+
+Templates out /etc/slurm/topology.conf file based on an OpenStack project for use by
+Slurm's [topology/tree plugin.](https://slurm.schedmd.com/topology.html) Models
+cluster as tree with a hierarchy of:
+
+Top-level inter-rack Switch -> Availability Zones -> Hypervisors -> VMs
+
+Warning: This role doesn't currently trigger a restart of Slurm so will therefore not
+reconfigure an already running cluster after a `ansible/site.yml` run. You will therefore need
+to run the `ansible/adhoc/restart-slurm.yml` playbook for changes to topology.conf to be
+recognised.
+
+Role Variables
+--------------
+
+- `topology_nodes:`: Required list of strs. List of inventory hostnames of nodes to include in topology tree. Must be set to include all compute nodes in Slurm cluster. Default `[]`.
+- `topology_conf_template`: Optional str. Path to Jinja2 template of topology.conf file. Default
+  `templates/topology.conf.j2`
+- `topology_above_rack_topology`: Optionally multiline str. Used to define topology above racks/AZs if 
+   you wish to partition racks further under different logical switches. New switches above should be
+   defined as [SwitchName lines](https://slurm.schedmd.com/topology.html#hierarchical) referencing 
+   rack Availability Zones under that switch in their `Switches fields`. These switches must themselves
+   be under a top level switch. e.g
+   ```
+   topology_above_rack_topology: |
+     SwitchName=rack-group-1 Switches=rack-az-1,rack-az-2
+     SwitchName=rack-group-2 Switches=rack-az-3,rack-az-4
+     SwitchName=top-level Switches=rack-group-1,rack-group-2
+   ```
+   Defaults to an empty string, which causes all AZs to be put under a
+   single top level switch.

ansible/roles/topology/defaults/main.yml

@@ -0,0 +1,8 @@
+# Nodes to be included in topology tree, must include all Slurm compute nodes
+topology_nodes: []
+
+# Override to use custom topology.conf template
+topology_conf_template: templates/topology.conf.j2
+
+topology_above_rack_topology: ""
+

ansible/roles/topology/library/map_hosts.py

@@ -0,0 +1,98 @@
+#!/usr/bin/python
+
+# Copyright: (c) 2025, StackHPC
+# Apache 2 License
+
+from ansible.module_utils.basic import AnsibleModule
+import openstack
+
+DOCUMENTATION = """
+---
+module: map_hosts
+short_description: Creates map of OpenStack VM network topology
+description:
+    - Creates map representing the network topology tree of an OpenStack project with a heirarchy
+      of: Availability Zone -> Hypervisors -> VMs/Baremetal instances
+options:
+    compute_vms:
+        description:
+            - List of VM names within the target OpenStack project to include in the tree
+        required: true
+        type: str
+author:
+    - Steve Brasier, William Tripp, StackHPC
+"""
+
+RETURN = """
+topology:
+    description:
+      Map representing tree of project topology. Top level keys are AZ names, their values
+      are maps of shortened unique identifiers of hosts UUIDs to lists of VM names
+    returned: success
+    type: dict[str, dict[str,list[str]]]
+    sample:
+      "nova-az":
+        "afe9":
+          - "mycluster-compute-0"
+          - "mycluster-compute-1"
+        "00f9":
+          - "mycluster-compute-vm-on-other-hypervisor"
+"""
+
+EXAMPLES = """
+- name: Get topology map
+  map_hosts:
+    compute_vms:
+      - mycluster-compute-0
+      - mycluster-compute-1
+"""
+
+def min_prefix(uuids, start=4):
+    """ Take a list of uuids and return the smallest length >= start which keeps them unique """
+    for length in range(start, len(uuids[0])):
+        prefixes = set(uuid[:length] for uuid in uuids)
+        if len(prefixes) == len(uuids):
+            return length
+
+def run_module():
+    module_args = dict(
+        compute_vms=dict(type='list', elements='str', required=True)
+    )
+    module = AnsibleModule(argument_spec=module_args, supports_check_mode=True)
+
+    conn = openstack.connection.from_config()
+
+    servers = [s for s in conn.compute.servers() if s["name"] in module.params["compute_vms"]]
+
+    topo = {}
+    all_host_ids = []
+    for s in servers:
+        az = s['availability_zone']
+        host_id = s['host_id']
+        if host_id != '': # empty string if e.g. server is shelved
+            all_host_ids.append(host_id)
+            if az not in topo:
+                topo[az] = {}
+            if host_id not in topo[az]:
+                topo[az][host_id] = []
+            topo[az][host_id].append(s['name'])
+
+    uuid_len = min_prefix(list(set(all_host_ids)))
+
+    for az in topo:
+        topo[az] = dict((k[:uuid_len], v) for (k, v) in topo[az].items())
+
+    result = {
+        "changed": False, 
+        "topology": topo,
+    }
+    
+    module.exit_json(**result)
+
+
+def main():
+    run_module()
+
+
+if __name__ == "__main__":
+    main()

ansible/roles/topology/tasks/main.yml

@@ -0,0 +1,16 @@
+- name: Map instances to hosts
+  become: false
+  map_hosts:
+    compute_vms: "{{ topology_nodes }}"
+  register: _topology
+  delegate_to: localhost
+  run_once: true
+
+- name: Template topology.conf
+  become: true
+  ansible.builtin.template:
+    src: "{{ topology_conf_template }}"
+    dest: /etc/slurm/topology.conf
+    owner: root
+    group: root
+    mode: 0644

ansible/roles/topology/templates/topology.conf.j2

@@ -0,0 +1,13 @@
+# topology.conf
+# Switch Configuration
+{% for az in _topology.topology.keys() %}
+{% for instance_host in _topology.topology[az].keys() %}
+SwitchName={{ instance_host }} Nodes={{ _topology.topology[az][instance_host] | join(",") }}
+{% endfor %}
+SwitchName={{ az }} Switches={{ _topology.topology[az].keys() | join(",") }}
+{% endfor %}
+{% if topology_above_rack_topology == '' %}
+SwitchName=master Switches={{ _topology.topology.keys() | join(",") }}
+{% else %}
+{{ topology_above_rack_topology }}
+{% endif %}

ansible/slurm.yml

@@ -60,7 +60,14 @@
   tags:
     - openhpc
   tasks:
-    - ansible.builtin.include_role:
+    - include_role:
+        name: topology
+      # Gated on topology group having compute nodes but role also
+      # needs to run on control and login nodes
+      when:
+        - appliances_mode == 'configure'
+        - groups['topology'] | length > 0
+    - include_role:
         name: stackhpc.openhpc
         tasks_from: "{{ 'runtime.yml' if appliances_mode == 'configure' else 'main.yml' }}"
 

environments/common/inventory/group_vars/all/openhpc.yml

@@ -58,6 +58,7 @@ openhpc_config_default:
     - enable_configless
   TaskPlugin: task/cgroup,task/affinity
   ReturnToService: 2 # workaround for templating bug TODO: Remove once on stackhpc.openhpc v1.2.0
+  TopologyPlugin: "topology/{{ 'tree' if (topology_nodes | length) > 0 else 'flat' }}"
 
 # default additional slurm.conf parameters when "rebuild" enabled:
 openhpc_config_rebuild:

environments/common/inventory/group_vars/all/proxy.yml

@@ -21,12 +21,12 @@ proxy_remove: false
 
 # full http proxy string - override if the above don't provide enough control:
 proxy_http_proxy: >-
-  {% if groups['squid'] | length > 0 %}
+  {%- if proxy_http_address != '' -%}
   http://
   {%- if proxy_basic_password -%}
   {{ proxy_basic_user }}:{{ proxy_basic_password }}@
   {%- endif -%}
   {{ proxy_http_address }}:{{ proxy_http_port }}
-  {% else %}
+  {%- else %}
 
-  {% endif %}
+  {%- endif %}