Update fs2 to new module structure
This commit is contained in:
@@ -1,78 +1,43 @@
|
|||||||
with import <nixpkgs> {};
|
with import <nixpkgs> {};
|
||||||
with import ../../lib/base.nix { inherit pkgs lib config; };
|
|
||||||
let
|
let
|
||||||
|
lib = import ../../lib/default.nix { inherit pkgs cfg lib config; };
|
||||||
|
|
||||||
hosts = [
|
hosts = [
|
||||||
{ name = "fs2-0"; address = "10.1.2.117"; }
|
{ name = "fs2-0"; address = "10.1.2.117"; hw = ./fs2-0.nix; }
|
||||||
];
|
];
|
||||||
|
|
||||||
fsConfig = node:
|
cfg = {
|
||||||
let
|
initca = ./ca;
|
||||||
cert = base.hostCerts.${node};
|
clusterName = "fs2";
|
||||||
in {
|
extraHosts = ''
|
||||||
k8s = {
|
10.253.18.106 fs0-0 fs0-0.itpartner.no fs0-0.itpartner.intern
|
||||||
initca = ./ca;
|
|
||||||
clusterName = "fs2";
|
|
||||||
clusterHosts = ''
|
|
||||||
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
|
10.253.18.100 k0-0 k0-0.itpartner.no k0-0.itpartner.intern
|
||||||
10.253.18.101 k0-1 k0-1.itpartner.no k0-1.itpartner.intern
|
10.253.18.101 k0-1 k0-1.itpartner.no k0-1.itpartner.intern
|
||||||
10.253.18.102 k0-2 k0-2.itpartner.no k0-2.itpartner.intern
|
10.253.18.102 k0-2 k0-2.itpartner.no k0-2.itpartner.intern
|
||||||
|
|
||||||
10.253.18.109 k1-0 k1-0.itpartner.no k1-0.itpartner.intern
|
10.253.18.109 k1-0 k1-0.itpartner.no k1-0.itpartner.intern
|
||||||
10.253.18.110 k1-1 k1-1.itpartner.no k1-1.itpartner.intern
|
10.253.18.110 k1-1 k1-1.itpartner.no k1-1.itpartner.intern
|
||||||
10.253.18.111 k1-2 k1-2.itpartner.no k1-2.itpartner.intern
|
10.253.18.111 k1-2 k1-2.itpartner.no k1-2.itpartner.intern
|
||||||
10.253.18.108 k1-3 k1-3.itpartner.no k1-3.itpartner.intern
|
10.253.18.108 k1-3 k1-3.itpartner.no k1-3.itpartner.intern
|
||||||
10.253.18.107 k0-4 k1-4.itpartner.no k1-4.itpartner.intern
|
10.253.18.107 k0-4 k1-4.itpartner.no k1-4.itpartner.intern
|
||||||
|
|
||||||
10.253.18.114 k2-0 k2-0.itpartner.no k2-0.itpartner.intern
|
10.253.18.114 k2-0 k2-0.itpartner.no k2-0.itpartner.intern
|
||||||
10.253.18.115 k2-1 k2-1.itpartner.no k2-1.itpartner.intern
|
10.253.18.115 k2-1 k2-1.itpartner.no k2-1.itpartner.intern
|
||||||
10.253.18.116 k2-2 k2-2.itpartner.no k2-2.itpartner.intern
|
10.253.18.116 k2-2 k2-2.itpartner.no k2-2.itpartner.intern
|
||||||
10.253.18.117 k2-3 k2-3.itpartner.no k2-3.itpartner.intern
|
10.253.18.117 k2-3 k2-3.itpartner.no k2-3.itpartner.intern
|
||||||
10.253.18.118 k2-4 k2-4.itpartner.no k2-4.itpartner.intern
|
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
|
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 = [
|
adminAuthorizedKeys = [
|
||||||
"dm_snapshot"
|
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKiAS30ZO+wgfAqDE9Y7VhRunn2QszPHA5voUwo+fGOf jonas"
|
||||||
"dm_mirror"
|
"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"
|
||||||
"dm_thin_pool"
|
];
|
||||||
];
|
|
||||||
|
|
||||||
networking = {
|
fs.nfs.exports = ''
|
||||||
hostName = node;
|
/vol/k2 10.253.18.0/24(insecure,rw,sync,no_subtree_check,crossmnt,fsid=0,no_root_squash)
|
||||||
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 = ''
|
|
||||||
/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
|
in
|
||||||
baseDeployment hosts {
|
lib.fs.mkDeployment hosts
|
||||||
fs2-0 = fsConfig "fs2-0";
|
|
||||||
}
|
|
||||||
|
|||||||
Reference in New Issue
Block a user