From e258edfcf48969605a33db4c1c5d87f716732f4a Mon Sep 17 00:00:00 2001
From: Maxime Boissonneault <maxime.boissonneault@calculquebec.ca>
Date: Thu, 2 Apr 2026 14:50:38 -0400
Subject: [PATCH] Allow metrix and Slurm DB to run on different instances

---
 manifests/init.pp         | 6 ++++++
 templates/99-local.py.epp | 6 +++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index 7cfdfc9..acb6c70 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -12,6 +12,9 @@
   String $slurm_password,
   String $cluster_name,
   String $subdomain,
+  String $slurm_user = 'slurm',
+  Optional[String] $slurm_db_ip = undef,
+  Optional[Integer] $slurm_db_port = undef,
 ) {
   include metrix::install
 
@@ -20,6 +23,7 @@
     content   => epp('metrix/99-local.py',
       {
         'password'        => $password,
+        'slurm_user'      => $slurm_user,
         'slurm_password'  => $slurm_password,
         'cluster_name'    => $cluster_name,
         'secret_key'      => stdlib::seeded_rand_string(32, $password),
@@ -30,6 +34,8 @@
         'prometheus_port' => $prometheus_port,
         'db_ip'           => $db_ip,
         'db_port'         => $db_port,
+        'slurm_db_ip'     => pick($slurm_db_ip, $db_ip),
+        'slurm_db_port'   => pick($slurm_db_port, $db_port),
         'base_dn'         => $base_dn,
         'ldap_password'   => $ldap_password,
       }
diff --git a/templates/99-local.py.epp b/templates/99-local.py.epp
index 3f53df7..ef5b40c 100644
--- a/templates/99-local.py.epp
+++ b/templates/99-local.py.epp
@@ -27,10 +27,10 @@ DATABASES = {
     'slurm': {
         'ENGINE': 'django.db.backends.mysql',
         'NAME': 'slurm_acct_db',
-        'USER': 'slurm',
+        'USER': '<%= $slurm_user %>',
         'PASSWORD': '<%= $slurm_password %>',
-        'HOST': '<%= $db_ip %>',
-        'PORT': '<%= $db_port %>',
+        'HOST': '<%= $slurm_db_ip %>',
+        'PORT': '<%= $slurm_db_port %>',
     },
     'ldap': {
         'ENGINE': 'ldapdb.backends.ldap',