modules/cluster/deployment: add option deployment.needForSpeed

hosts/server10/default.nix

@@ -11,7 +11,7 @@
     hq.statistics.enable = true;
   };
 
-  boot= {
+  boot = {
     loader.grub = {
       enable = true;
       version = 2;
@@ -49,6 +49,7 @@
     "data-hoarder"
     "staging-data-hoarder"
   ];
+  skyflake.nomad.client.meta."c3d2.cpuSpeed" = "4";
 
   system.stateVersion = "21.11"; # Did you read the comment?
 }

hosts/server8/default.nix

@@ -38,4 +38,5 @@
     # deployment.microvmBaseZfsDataset = "tank/storage";
     hq.statistics.enable = true;
   };
+  skyflake.nomad.client.meta."c3d2.cpuSpeed" = "3";
 }

hosts/server9/default.nix

@@ -35,6 +35,7 @@
     deployment.microvmBaseZfsDataset = "tank/storage";
     hq.statistics.enable = true;
   };
+  skyflake.nomad.client.meta."c3d2.cpuSpeed" = "3";
 
   # XXX: enable for zw-ev and poelzi-ha until we find a better solution
   virtualisation.libvirtd = {

modules/cluster/deployment-options.nix

@@ -21,6 +21,16 @@
     storage = mkOption {
       type = types.enum [ "fast" "big" ];
       default = "fast";
+      description = ''
+        Which glusterfs volume to use for persistedShares
+      '';
+    };
+    needForSpeed = mkOption {
+      type = types.bool;
+      default = false;
+      description = ''
+        Prefer deployment on Nomad clients with a higher c3d2.cpuSpeed
+      '';
     };
   };
 }

modules/cluster/deployment.nix

@@ -77,10 +77,17 @@ in
   };
 
   skyflake = {
-    nomadJob.constraints = lib.optionals (config.deployment.storage == "big") [ {
+    nomadJob = {
-      attribute = "\${meta.c3d2.storage}";
+      constraints = lib.optionals (config.deployment.storage == "big") [ {
-      value = "big";
+        attribute = "\${meta.c3d2.storage}";
-    } ];
+        value = "big";
+      } ];
+      affinities = lib.optionals config.deployment.needForSpeed (builtins.genList (i: {
+        attribute = "\${meta.c3d2.cpuSpeed}";
+        value = toString (i + 1);
+        weight = 10 + i;
+      }) 10);
+    };
   };
 
   networking = {