diff --git a/topology/default.nix b/topology/default.nix index 7384032..811801f 100644 --- a/topology/default.nix +++ b/topology/default.nix @@ -167,6 +167,13 @@ in { interfaces.ens18.network = "pvv"; }; + nodes.temmie = { + guestType = "proxmox"; + parent = config.nodes.powerpuff-cluster.id; + + interfaces.ens18.network = "pvv"; + }; + nodes.ustetind = { guestType = "proxmox LXC"; parent = config.nodes.powerpuff-cluster.id; @@ -219,7 +226,7 @@ in { (mkConnection "demiurgen" "eno1") (mkConnection "sanctuary" "ethernet_0") (mkConnection "torskas" "eth0") - (mkConnection "skrott" "eth0") + (mkConnection "skrot" "eth0") (mkConnection "homeassistant" "eth0") (mkConnection "orchid" "eth0") (mkConnection "principal" "em0") @@ -259,6 +266,12 @@ in { guestType = "openstack"; parent = config.nodes.stackit.id; + interfaces.enp2s0.network = "pvv"; + }; + nodes.gluttony = { + guestType = "openstack"; + parent = config.nodes.stackit.id; + interfaces.enp2s0.network = "pvv"; }; } diff --git a/topology/non-nixos-machines.nix b/topology/non-nixos-machines.nix index 9667870..10b12e6 100644 --- a/topology/non-nixos-machines.nix +++ b/topology/non-nixos-machines.nix @@ -290,21 +290,6 @@ in { }; }; - nodes.skrott = mkDevice "skrott" { - # TODO: the interface name is likely wrong - interfaceGroups = [ [ "eth0" ] ]; - interfaces.eth0 = { - # mac = ""; - addresses = [ - "129.241.210.235" - ]; - gateways = [ - values.hosts.gateway - values.hosts.gateway6 - ]; - }; - }; - nodes.torskas = mkDevice "torskas" { deviceIcon = "${pkgs.super-tiny-icons}/share/icons/SuperTinyIcons/svg/arch_linux.svg";