From f5686bd4cf789be578d8827899fa4c16010654ad Mon Sep 17 00:00:00 2001
From: Michel Jouvin <jouvin@lal.in2p3.fr>
Date: Wed, 11 Dec 2024 16:45:17 +0100
Subject: [PATCH] Update the OS version definition for each server

- Remove default version
- Make sure each test server has an entry defining its OS version
---
 clusters/grid/umd4/site/cluster_info.pan |  3 --
 sites/example/site/os/version_db.pan     | 39 +++++++++++++-----------
 2 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/clusters/grid/umd4/site/cluster_info.pan b/clusters/grid/umd4/site/cluster_info.pan
index a1ecbb0..ae73324 100644
--- a/clusters/grid/umd4/site/cluster_info.pan
+++ b/clusters/grid/umd4/site/cluster_info.pan
@@ -26,13 +26,10 @@ variable ENABLE_MPI ?= false;
 # phase and to reset it to false afterwards.
 # You can also override the default value defined here in a specific profile.
 variable AII_V2_INSTALL ?= false;
-
 #
 # OS version definition
 #
 variable NODE_OS_VERSION_DB = "site/os/version_db";
-variable NODE_OS_VERSION_DEFAULT = "sl640-x86_64";
-
 
 # Default repository configuration template for the cluster
 variable PKG_REPOSITORY_CONFIG ?= 'repository/config';
diff --git a/sites/example/site/os/version_db.pan b/sites/example/site/os/version_db.pan
index 4c7ae1f..1eab0ab 100644
--- a/sites/example/site/os/version_db.pan
+++ b/sites/example/site/os/version_db.pan
@@ -14,7 +14,9 @@ unique template site/os/version_db;
 
 variable YUM_OS_DISTRIBUTION = {
     # Default per OS version
-    SELF['el7'] = 'centos71';
+    SELF['el9'] = 'al9';
+    SELF['el8'] = 'al8';
+    SELF['el7'] = 'centos7';
 
     # Explicit value per host name
     SELF['ui.example.org'] = 'centos7';
@@ -24,22 +26,25 @@ variable YUM_OS_DISTRIBUTION = {
 
 
 variable OS_VERSION = dict(
-    escape("cream.example.org"), "el7x-x86_64",
-    escape("dcache-head.example.org"), "el7x-i386",
-    escape("dcache-pool.example.org"), "el7x-i386",
-    escape("hydra.example.org"), "el7x-x86_64",
-    escape("lfc.example.org"), "el7x-x86_64",
-    escape("mon.example.org"), "el7x-x86_64",
-    escape("ui.example.org"), "el7x-x86_64",
-    escape("wmslb.example.org"), "el7x-x86_64",
-    escape("wn2.example.org"), "el7x-x86_64",
-    escape("xen-guest.example.org"), "el7x-x86_64",
-    escape("xen-host.example.org"), "el7x-x86_64",
-
-    escape("nagios-server.example.org"), "el7x-x86_64",
-    escape("nagios-master.example.org"), "el7x-x86_64",
-    escape("nagios-slave-A.example.org"), "el7x-x86_64",
-    escape("nagios-slave-B.example.org"), "el7x-x86_64",
+    # Grid cluster
+    '{apel.example.org}', 'el7x-x86_64',
+    '{argus.example.org}', 'el7x-x86_64',
+    '{bdii.example.org}', 'el7x-x86_64',
+    '{px.example.org.tpl.disabled}', 'el7x-x86_64',
+    '{se-dpm-disk2.example.org}', 'el7x-x86_64',
+    '{se-dpm-disk.example.org}', 'el7x-x86_64',
+    '{se-dpm-server.example.org}', 'el7x-x86_64',
+    '{topbdii.example.org}', 'el7x-x86_64',
+    '{ui.example.org}', 'el7x-x86_64',
+    '{wn2.example.org}', 'el7x-x86_64',
+    '{wn3.example.org}', 'el7x-x86_64',
+    '{wn.example.org}', 'el7x-x86_64',
+
+    # Misc cluster
+    '{nagios-server.example.org}', 'el7x-x86_64',
+    '{nagios-master.example.org}', 'el7x-x86_64',
+    '{nagios-slave-A.example.org}', 'el7x-x86_64',
+    '{nagios-slave-B.example.org}', 'el7x-x86_64',
 );