fixup! cluster/services/consul: test in simulacrum

cluster/services/consul/test.nix

@@ -5,9 +5,10 @@
     start_all()
 
     with subtest("should form cluster"):
-      for machine in machines:
+      nodes = [ n for n in machines if n != nowhere ]
+      for machine in nodes:
         machine.succeed("systemctl start consul-ready.service")
-      for machine in machines:
+      for machine in nodes:
         consulConfig = json.loads(machine.succeed("cat /etc/consul.json"))
         addr = consulConfig["addresses"]["http"]
         port = consulConfig["ports"]["http"]

cluster/simulacrum/default.nix

@@ -59,13 +59,11 @@ testers.runNixOSTest {
   imports = [
     serviceConfig.simulacrum.settings
     ./nowhere
-    ({ config, ... }: {
+    {
-      config = lib.mkIf config.nowhere.enable {
       nodes.nowhere.imports = [
-          lift.flake.nixosModules.port-magic
+        config.flake.nixosModules.port-magic
       ];
-      };
+    }
-    })
   ] ++ allAugments;
 
   _module.args = {

cluster/simulacrum/nowhere/default.nix

@@ -58,7 +58,6 @@ in
   imports = [
     ./options.nix
   ];
-  config = lib.mkIf config.nowhere.enable {
   defaults = {
     networking.hosts."${getNodeAddr "nowhere"}" = lib.attrNames config.nowhere.names;
     security.pki.certificateFiles = [
@@ -99,5 +98,4 @@ in
       }) lift.nowhere.names;
     };
   };
-  };
 }

cluster/simulacrum/nowhere/options.nix

@@ -2,7 +2,6 @@
 
 {
   options.nowhere = {
-    enable = lib.mkEnableOption "Nowhere";
     names = lib.mkOption {
       description = "Hostnames that point Nowhere.";
       type = with lib.types; attrsOf str;