Fix linting issues on the merge of origin/main

Author: maxstack

ansible/roles/topology/README.md

@@ -1,5 +1,4 @@
-topology
-========
+# 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
@@ -12,22 +11,23 @@ reconfigure an already running cluster after a `ansible/site.yml` run. You will
 to run the `ansible/adhoc/restart-slurm.yml` playbook for changes to topology.conf to be
 recognised.
 
-Role Variables
---------------
+## 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.
+- `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
+
+  ```yaml
+  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

@@ -5,4 +5,3 @@ topology_nodes: []
 topology_conf_template: templates/topology.conf.j2
 
 topology_above_rack_topology: ""
-

ansible/roles/topology/library/map_hosts.py

@@ -1,10 +1,10 @@
-#!/usr/bin/python
+#!/usr/bin/python # pylint: disable=missing-module-docstring
 
 # Copyright: (c) 2025, StackHPC
 # Apache 2 License
 
-from ansible.module_utils.basic import AnsibleModule
-import openstack
+import openstack  # pylint: disable=import-error
+from ansible.module_utils.basic import AnsibleModule  # pylint: disable=import-error
 
 DOCUMENTATION = """
 ---
@@ -47,50 +47,54 @@
       - mycluster-compute-1
 """
 
+
 def min_prefix(uuids, start=4):
-    """ Take a list of uuids and return the smallest length >= start which keeps them unique """
+    """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
+    # Fallback to returning the full length
+    return len(uuids[0])
+
 
-def run_module():
-    module_args = dict(
-        compute_vms=dict(type='list', elements='str', required=True)
-    )
+def run_module():  # pylint: disable=missing-function-docstring
+    module_args = {"compute_vms": {"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"]]
+    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
+        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'])
+            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, 
+        "changed": False,
         "topology": topo,
     }
-    
+
     module.exit_json(**result)
 
 
-def main():
+def main():  # pylint: disable=missing-function-docstring
     run_module()
 
 

ansible/roles/topology/tasks/main.yml

@@ -13,4 +13,4 @@
     dest: /etc/slurm/topology.conf
     owner: root
     group: root
-    mode: 0644
+    mode: "0644"

ansible/slurm.yml

@@ -60,14 +60,14 @@
   tags:
     - openhpc
   tasks:
-    - include_role:
+    - ansible.builtin.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:
+    - ansible.builtin.include_role:
         name: stackhpc.openhpc
         tasks_from: "{{ 'runtime.yml' if appliances_mode == 'configure' else 'main.yml' }}"
 

environments/skeleton/{{cookiecutter.environment}}/tofu/node_group/variables.tf

@@ -149,9 +149,9 @@ variable "match_ironic_node" {
 }
 
 variable "availability_zone" {
-    type = string
-    description = "Name of availability zone. If undefined, defaults to 'nova' if match_ironic_node is true, deferred to OpenStack otherwise"
-    default = null
+  type        = string
+  description = "Name of availability zone. If undefined, defaults to 'nova' if match_ironic_node is true, deferred to OpenStack otherwise"
+  default     = null
 }
 
 variable "baremetal_nodes" {