From 62cd35b3cc600272ef81bdcf26bb2b810ab34422 Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <dbd@ehtrace.com>
Date: Mon, 8 Aug 2022 10:00:16 +0200
Subject: [PATCH] Update to 2022-08-08 10:00

---
 roles/nomad/defaults/main.yml      | 13 +++++++++++++
 roles/nomad/templates/nomad.hcl.j2 | 10 ++++++++++
 2 files changed, 23 insertions(+)

diff --git a/roles/nomad/defaults/main.yml b/roles/nomad/defaults/main.yml
index d785919..e7e2eb7 100644
--- a/roles/nomad/defaults/main.yml
+++ b/roles/nomad/defaults/main.yml
@@ -128,6 +128,19 @@ nomad_base_conf:
     # Name of the authoritative region from which policies will be pulled
     # authoritative_region: eu
 
+    # Default scheduler config. Only used during cluster bootstrap
+    # If you want to change it after, you have to use the API
+    default_scheduler_config:
+      # can be binpack or spread. SPread makes more sens when running on premise
+      scheduler_algorithm: spread
+      memory_oversubscription_enabled: True
+      preemption_config:
+        batch_scheduler_enabled: True
+        system_scheduler_enabled: True
+        service_scheduler_enabled: True
+        sysbatch_scheduler_enabled: True
+
+
   # UI related settings
   ui:
     # Default is to enable the UI on server only
diff --git a/roles/nomad/templates/nomad.hcl.j2 b/roles/nomad/templates/nomad.hcl.j2
index c26a286..3ff3d10 100644
--- a/roles/nomad/templates/nomad.hcl.j2
+++ b/roles/nomad/templates/nomad.hcl.j2
@@ -54,6 +54,16 @@ server {
 {% if nomad_conf.server.authoritative_region is defined %}
   authoritative_region = "{{ nomad_conf.server.authoritative_region }}"
 {% endif %}
+
+  default_scheduler_config {
+    scheduler_algorithm = "{{ nomad_conf.server.default_scheduler_config.scheduler_algorithm }}"
+    memory_oversubscription_enabled = {{ nomad_conf.server.default_scheduler_config.memory_oversubscription_enabled | ternary('true', 'false') }}
+    preemption_config {
+{% for type in ['batch', 'system', 'sysbatch', 'service'] %}
+      {{ type }}_scheduler_enabled = {{ nomad_conf.server.default_scheduler_config.preemption_config[type ~ '_scheduler_enabled'] | ternary('true', 'false') }}
+{% endfor %}
+    }
+  }
 }
 
 {% if nomad_conf.client.enabled %}