fixup! cluster/simulacrum: allow limiting nodes

cluster/lib/service-module.nix

@@ -1,9 +1,8 @@
-{ config, lib, name, ... }:
+{ config, lib, ... }:
 with lib;
 
 let
   filterGroup = group: hostName: builtins.filter (x: x != hostName) group;
-  serviceName = name;
 in
 
 {
@@ -65,6 +64,11 @@ in
         type = types.deferredModule;
         default = {};
       };
+      availableNodes = mkOption {
+        description = "Nodes to include in the scenario.";
+        type = with types; nullOr (listOf str);
+        default = null;
+      };
     };
   };
   config.otherNodes = builtins.mapAttrs (const filterGroup) config.nodes;

cluster/services/consul/agent.nix

@@ -25,7 +25,7 @@ in
       bind_addr = hl.ipv4;
       ports.serf_lan = hl.port;
       retry_join = map (hostName: hostLinks.${hostName}.consul.tuple) (cfg.otherNodes.agent hostName);
-      bootstrap_expect = builtins.length cfg.nodes.agent;
+      bootstrap_expect = 3;
       addresses.http = config.links.consulAgent.ipv4;
       ports.http = config.links.consulAgent.port;
     };

cluster/services/consul/default.nix

@@ -26,6 +26,7 @@ in
       enable = true;
       deps = [ "wireguard" ];
       settings = ./test.nix;
+      availableNodes = lib.take 3 cfg.nodes.agent;
     };
   };
 

cluster/services/dns/default.nix

@@ -60,6 +60,7 @@ in
       enable = true;
       deps = [ "consul" "acme-client" "patroni" ];
       settings = ./test.nix;
+      availableNodes = cfg.nodes.authoritative;
     };
   };
 

cluster/services/patroni/default.nix

@@ -41,6 +41,7 @@
       enable = true;
       deps = [ "consul" "incandescence" "locksmith" ];
       settings = ./simulacrum/test.nix;
+      availableNodes = config.services.patroni.nodes.worker;
     };
   };
 }

cluster/services/storage/default.nix

@@ -58,6 +58,7 @@ in
       enable = true;
       deps = [ "wireguard" "consul" "locksmith" "dns" "incandescence" "ways" ];
       settings = ./simulacrum/test.nix;
+      availableNodes = config.services.storage.nodes.garage;
     };
   };
 

cluster/services/ways/default.nix

@@ -13,6 +13,7 @@
       enable = true;
       deps = [ "nginx" "acme-client" "dns" "certificates" "consul" ];
       settings = ./simulacrum/test.nix;
+      availableNodes = lib.take 3 config.services.ways.nodes.host;
     };
   };
 

cluster/services/ways/simulacrum/test.nix

@@ -20,7 +20,7 @@ in
         };
       };
     }
-    (lib.genAttrs cluster.config.services.ways.nodes.host (lib.const {
+    (lib.genAttrs cluster.config.services.ways.simulacrum.availableNodes (lib.const {
       services.nginx.upstreams.nowhere.servers = {
         "${(builtins.head config.nodes.nowhere.networking.interfaces.eth1.ipv4.addresses).address}:8080" = {};
       };

cluster/simulacrum/default.nix

@@ -22,8 +22,10 @@ let
     };
   };
 
-  nodes = lib.attrNames config.gods.fromLight;
+  nodesConfigured = config.cluster.config.services.${service}.simulacrum.availableNodes;
-  nodes' = lib.attrNames (config.gods.fromLight // { nowhere = null; });
+  availableNodes = if nodesConfigured == null then config.gods.fromLight else lib.genAttrs nodesConfigured (_: throw "unreachable");
+  nodes = lib.attrNames availableNodes;
+  nodes' = lib.attrNames (availableNodes // { nowhere = null; });
   digits = lib.attrsets.listToAttrs (lib.zipListsWith lib.nameValuePair nodes' (lib.range 1 255));
   depot' = extendModules {
     modules = [

cluster/simulacrum/nowhere/default.nix

@@ -52,6 +52,8 @@ let
   genHostCert = hostname: genCert [ "--hostname=${hostname}" ] { CN = hostname; };
 
   getNodeAddr = node: (builtins.head config.nodes.${node}.networking.interfaces.eth1.ipv4.addresses).address;
+
+  filterActiveNodes = lib.filterAttrs (node: _: config.nodes ? ${node});
 in
 
 {
@@ -79,7 +81,7 @@ in
         address = hour.interfaces.primary.addrPublic;
         prefixLength = 32;
         via = getNodeAddr name;
-      }) depot.gods.fromLight;
+      }) (filterActiveNodes depot.gods.fromLight);
       nameservers = map (name: depot.hours.${name}.interfaces.primary.addrPublic) cluster.config.services.dns.nodes.authoritative;
     };
     services.nginx = {