From 31a9cf90e021ba4589a481adbd7c925c41b22757 Mon Sep 17 00:00:00 2001
From: Stig Telfer <stig@stackhpc.com>
Date: Wed, 30 Jul 2025 22:40:42 +0100
Subject: [PATCH 1/2] Define rack-level Nova AZs

Define host aggregates with AZ designation as metadata.  The intention
is to use these AZs for enabing topology-aware scheduling in Slurm
---
 etc/openstack-config/openstack-config.yml | 70 ++++++++++++++++++++++-
 1 file changed, 69 insertions(+), 1 deletion(-)

diff --git a/etc/openstack-config/openstack-config.yml b/etc/openstack-config/openstack-config.yml
index 9df9e5c..bc6d960 100644
--- a/etc/openstack-config/openstack-config.yml
+++ b/etc/openstack-config/openstack-config.yml
@@ -589,7 +589,75 @@ hpc_v2_16cpu_128ram_a100:
 
 # List of nova host aggregates. Format is as required by the
 # stackhpc.os_host_aggregates role.
-#openstack_host_aggregates:
+openstack_host_aggregates:
+  - "{{ openstack_aggregate_rack_5 }}"
+  - "{{ openstack_aggregate_rack_6 }}"
+  - "{{ openstack_aggregate_rack_11 }}"
+  - "{{ openstack_aggregate_rack_12 }}"
+
+openstack_aggregate_rack_5:
+  name: "DL-Rack-5"
+  hosts:
+    - "compute1"
+    - "compute2"
+    - "compute3"
+    - "compute4"
+    - "compute5"
+    - "compute6"
+    - "compute7"
+    - "compute8"
+    - "gpu1"
+    - "gpu2"
+  metadata:
+    availability_zone: "DL-Rack-5"
+
+openstack_aggregate_rack_6:
+  name: "DL-Rack-6"
+  hosts:
+    - "compute9"
+    - "compute10"
+    - "compute11"
+    - "compute12"
+    - "compute13"
+    - "compute14"
+    - "compute15"
+    - "compute16"
+    - "compute17"
+    - "compute18"
+  metadata:
+    availability_zone: "DL-Rack-6"
+
+openstack_aggregate_rack_11:
+  name: "DL-Rack-11"
+  hosts:
+    - "compute19"
+    - "compute20"
+    - "compute21"
+    - "compute22"
+    - "compute23"
+    - "compute24"
+    - "compute25"
+    - "compute26"
+    - "compute27"
+    - "compute28"
+  metadata:
+    availability_zone: "DL-Rack-11"
+
+openstack_aggregate_rack_12:
+  name: "DL-Rack-12"
+  hosts:
+    - "compute29"
+    - "compute30"
+    - "compute31"
+    - "compute32"
+    - "compute33"
+    - "compute34"
+    - "compute35"
+    - "compute36"
+    - "compute37"
+    - "compute38"
+  metadata:
+    availability_zone: "DL-Rack-12"
 
 ###############################################################################
 # Configuration of Glance software images.

From 99f8031f19805c940876bb4bffc9d333630bfe58 Mon Sep 17 00:00:00 2001
From: Matt Crees <mattc@stackhpc.com>
Date: Tue, 5 Aug 2025 08:55:43 +0000
Subject: [PATCH 2/2] AZ corrections

Update application of AZ properties.
Comment out compute nodes currently offline.
---
 etc/openstack-config/openstack-config.yml | 26 +++++++++++------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/etc/openstack-config/openstack-config.yml b/etc/openstack-config/openstack-config.yml
index bc6d960..d7a75b1 100644
--- a/etc/openstack-config/openstack-config.yml
+++ b/etc/openstack-config/openstack-config.yml
@@ -595,6 +595,7 @@ openstack_host_aggregates:
   - "{{ openstack_aggregate_rack_11 }}"
   - "{{ openstack_aggregate_rack_12 }}"
 
+# PTR Rack 5
 openstack_aggregate_rack_5:
   name: "DL-Rack-5"
   hosts:
@@ -608,25 +609,25 @@ openstack_aggregate_rack_5:
     - "compute8"
     - "gpu1"
     - "gpu2"
-  metadata:
-    availability_zone: "DL-Rack-5"
+  availability_zone: "DL-Rack-5"
 
+# PTR Rack 6
 openstack_aggregate_rack_6:
   name: "DL-Rack-6"
   hosts:
     - "compute9"
-    - "compute10"
+#   - "compute10"
     - "compute11"
     - "compute12"
     - "compute13"
-    - "compute14"
+#   - "compute14"
     - "compute15"
     - "compute16"
-    - "compute17"
-    - "compute18"
-  metadata:
-    availability_zone: "DL-Rack-6"
+#   - "compute17"
+#   - "compute18"
+  availability_zone: "DL-Rack-6"
 
+# PTR Rack 11
 openstack_aggregate_rack_11:
   name: "DL-Rack-11"
   hosts:
@@ -639,10 +640,10 @@ openstack_aggregate_rack_11:
     - "compute25"
     - "compute26"
     - "compute27"
-    - "compute28"
-  metadata:
-    availability_zone: "DL-Rack-11"
+#   - "compute28"
+  availability_zone: "DL-Rack-11"
 
+# PTR Rack 12
 openstack_aggregate_rack_12:
   name: "DL-Rack-12"
   hosts:
@@ -656,8 +657,7 @@ openstack_aggregate_rack_12:
     - "compute36"
     - "compute37"
     - "compute38"
-  metadata:
-    availability_zone: "DL-Rack-12"
+  availability_zone: "DL-Rack-12"
 
 ###############################################################################
 # Configuration of Glance software images.