Update fs2 to new module structure

clusters/fs2/default.nix

@@ -1,18 +1,15 @@
 with import <nixpkgs> {};
-with import ../../lib/base.nix { inherit pkgs lib config; };
 let
+  lib = import ../../lib/default.nix { inherit pkgs cfg lib config; };
+
   hosts = [
-    { name = "fs2-0"; address = "10.1.2.117"; }
+    { name = "fs2-0"; address = "10.1.2.117"; hw = ./fs2-0.nix; }
   ];
 
-  fsConfig = node:
-    let
-      cert = base.hostCerts.${node};
-    in {
-      k8s = {
+  cfg = {
     initca = ./ca;
     clusterName = "fs2";
-        clusterHosts = ''
+    extraHosts = ''
       10.253.18.106 fs0-0 fs0-0.itpartner.no fs0-0.itpartner.intern
 
       10.253.18.100 k0-0 k0-0.itpartner.no k0-0.itpartner.intern
@@ -32,47 +29,15 @@ let
       10.253.18.118 k2-4 k2-4.itpartner.no k2-4.itpartner.intern
       10.253.18.103 k2-5 k2-5.itpartner.no k2-5.itpartner.intern
     '';
+
     adminAuthorizedKeys = [
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKiAS30ZO+wgfAqDE9Y7VhRunn2QszPHA5voUwo+fGOf jonas"
       "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCk5EKXxo/KLogjqSxSf/GkQdZ30UxB3wXc5k6Y6RRKQ/5iJ+XyYTbuqYOUp30p54apZzbayU2icahE/upr754lQicQwJtOXW/Iut57VRhSpq4P+mKCIdT58xCUkAZYr8Aja8UjHlYeJgFvp023K/fqmwbapu8R1gh4bzXm7uU1XeJoYfuOb+Cb8NGMn1ICrw2aztA0yVOXZ7tyJd2qyr1+6PuM/Ca2nKN4wLIX2vwyN3vZjR15nkIaHQGlTaJlNk2NEG1YTxsIQ9axDjNtyL80kjUr5M8zxW6s0h3451zr1b21EetP1i+1POIjS9uWXv5iabF+1Qb1GaS4FAYzzpqNY+moLzY7Zqfi05MPsMYkNoZ1Kg5aj0IuZb0OM9i6ZJrFs9nYAGG0uLSUTfrs957f9nokFyILGYg5xY46YN3uQrqfZifvcR0KaEdxEKvnfq0qrNG3uYLR/OYm2yblRcNbWgDoQ1hH7qa9uJM2JrPM07s4sJGkqfAib8Hwz9+l7jMrL6KIGUOA4aX0B1KZaIKKiZa42WlgdbeA17aW3laIqS5mZCkI3pLMYZAxe+A6rQi+V8ZAvDSyOL/Vws3lboXaN5QLu17R8uCY7MkIAvRBiZSpdWNeX3JO5m6zexkxkrFlxyEBf+ott4ATSw+eMYMs8i5xQRqPjgO1cABWkUdGpw== martin.moe.carstens@itpartner.no"
     ];
-      };
 
-      boot.kernelModules = [
-        "dm_snapshot"
-        "dm_mirror"
-        "dm_thin_pool"
-      ];
-
-      networking = {
-        hostName = node;
-        extraHosts = settings.clusterHosts;
-        firewall.allowedTCPPortRanges = [ { from = 5000; to = 50000; } ];
-        firewall.allowedTCPPorts = [ 111 2049 ];
-        firewall.allowedUDPPorts = [ 111 2049 24007 24008 ];
-      };
-
-      services.glusterfs = {
-        enable = false;
-        tlsSettings = {
-          caCert = base.pki.ca.cert;
-          tlsKeyPath = cert.key;
-          tlsPem = cert.cert;
-        };
-      };
-
-      services.nfs.server = {
-        enable = true;
-        exports = ''
+    fs.nfs.exports = ''
        /vol/k2 10.253.18.0/24(insecure,rw,sync,no_subtree_check,crossmnt,fsid=0,no_root_squash)
     '';
   };
-
-      environment.systemPackages = [ pkgs.lvm2 ];
-
-      imports = [ ./fs2-0.nix ];
-    };
 in
-  baseDeployment hosts {
-    fs2-0 = fsConfig "fs2-0";
-  }
+  lib.fs.mkDeployment hosts