diff --git a/hosts.nix b/hosts.nix index f542344..43ecad4 100644 --- a/hosts.nix +++ b/hosts.nix @@ -1,14 +1,57 @@ rec { vlans = { - srv = {id = 2;}; - srv-nat = {id = 3;}; - san = {id = 4;}; - adm = {id = 10;}; - adh = {id = 12;}; - adm-adh = {id = 13;}; - vr = {id = 27;}; - aurore = {id = 28;}; - imprimante = {id = 2756;}; + void = { + id = 1; + description = "VLAN par défaut des switchs"; + }; + srv = { + id = 2; + description = "Serveurs du Crans à IP publiques"; + ipv4 = "185.230.79.0/26"; + ipv6 = "2a0c:700:2::/64"; + }; + srv-nat = { + id = 3; + description = "Serveur du Crans derrière un NAT"; + ipv4 = "172.16.3.0/24"; + ipv6 = "2a0c:700:3::/64"; + }; + san = { + id = 4; + description = "Interconnexion avec les baies de stockage"; + }; + ceph = { + id = 6; + description = "VLan interne pour ceph (synchronisation des nodes ceph)"; + }; + adm = { + id = 10; + description = "Administration des serveurs"; + }; + adh = { + id = 12; + description = "Machines des adhérent·e·s à IP publiques"; + }; + adm-adh = { + id = 13; + description = "Administration des machines des adhérent·e·s"; + }; + viarezo = { + id = 27; + description = "Interconnexion avec viarezo"; + }; + aurore = { + id = 28; + description = "Interconnexion avec aurore"; + }; + ens = { + id = 38; + description = "Interconnexion avec l'ENS (arrive détaggé & vlan 2751 pour l'ENS)"; + }; + lp = { + id = 56; + description = "Connexion avec l'imprimante (vlan 2756 pour l'ENS)"; + }; }; reseaux = { @@ -22,7 +65,7 @@ rec { }; # vr = { # vlans = with vlans; [ - # vr + # viarezo # ]; # switch = { # arceus = 21; @@ -30,7 +73,8 @@ rec { # }; ens = { vlans = with vlans; [ - imprimante + ens + lp ]; switch = { carapuce = 17; @@ -64,9 +108,6 @@ rec { switch = { carapuce = 13; arceus = 13; - ilo = { - carapuce = 25; # TODO - }; }; }; @@ -85,9 +126,10 @@ rec { switch = { carapuce = 10; arceus = 10; - ilo = { - carapuce = 10; # TODO - }; + }; + ilo = { + id = 51; + switch.salameche = 18; }; }; cameron = { @@ -102,6 +144,14 @@ rec { Stockage adh ''; public-ssh = "ssh-rsa TODOTODOTODOTODOTODOTODOTODO"; + switch = { + # TODO: temp rebasculer sur fibre + salameche = -1 ; + }; + ilo = { + id = 52; + switch.salameche = 16; + }; }; # cephirot = { # id = 3; @@ -119,10 +169,7 @@ rec { arceus = { is_debian = true; id = 7; - vlans = with vlans; [ - adm - san - ]; + vlans = vlans; serveur_type = ["switch"]; description = '' Switch principal @@ -132,13 +179,38 @@ rec { carapuce = { is_debian = true; id = 8; + vlans = vlans; + serveur_type = ["switch"]; + description = '' + Switch principal + ''; + public-ssh = "ssh-rsa TODOTODOTODOTODOTODOTODOTODO"; + }; + rodney = { + is_debian = true; + id = 9; + vlans = with vlans; [ + adh + adm + adm-adh + san + ]; + serveur_type = ["switch"]; + description = '' + Switch adh + ''; + public-ssh = "ssh-rsa TODOTODOTODOTODOTODOTODOTODO"; + }; + salameche = { + is_debian = true; + id = 10; vlans = with vlans; [ adm san ]; serveur_type = ["switch"]; description = '' - Switch principal + Switch ilo ''; public-ssh = "ssh-rsa TODOTODOTODOTODOTODOTODOTODO"; }; @@ -159,9 +231,10 @@ rec { switch = { carapuce = 1; arceus = 1; - ilo = { - carapuce = 25; # TODO - }; + }; + ilo = { + id = 21; + switch.salameche = 2; # TODO }; }; daniel = { @@ -180,9 +253,10 @@ rec { switch = { carapuce = 3; arceus = 3; - ilo = { - carapuce = 25; # TODO - }; + }; + ilo = { + id = 22; + switch.salameche = 4; # TODO }; }; jack = { @@ -201,9 +275,10 @@ rec { switch = { carapuce = 5; arceus = 5; - ilo = { - carapuce = 25; # TODO - }; + }; + ilo = { + id = 23; + switch.salameche = 6; # TODO }; };