Ildkule/openstack: fix networking

Removes systemd-networkd, and configures proper ipv4 and ipv6 in
openstack.
This commit is contained in:
Felix Albrigtsen 2024-07-28 19:25:52 +02:00 committed by Felix Albrigtsen
parent 8f3013dc00
commit 46f5053d4d
3 changed files with 31 additions and 17 deletions

View File

@ -1,4 +1,4 @@
{ config, pkgs, values, ... }: { config, pkgs, lib, values, ... }:
{ {
imports = [ imports = [
# Include the results of the hardware scan. # Include the results of the hardware scan.
@ -19,11 +19,28 @@
boot.tmp.cleanOnBoot = true; boot.tmp.cleanOnBoot = true;
zramSwap.enable = true; zramSwap.enable = true;
networking.hostName = "ildkule"; # Define your hostname. # Openstack Neutron and systemd-networkd are not best friends, use something else:
systemd.network.networks."30-all" = values.defaultNetworkConfig // { systemd.network.enable = lib.mkForce false;
matchConfig.Name = "en*"; networking = let
DHCP = "yes"; hostConf = values.hosts.ildkule;
gateway = [ ]; in {
hostName = "ildkule";
tempAddresses = "disabled";
useDHCP = lib.mkForce true;
search = values.defaultNetworkConfig.domains;
nameservers = values.defaultNetworkConfig.dns;
defaultGateway.address = hostConf.ipv4_internal_gw;
interfaces."ens4" = {
ipv4.addresses = [
{ address = hostConf.ipv4; prefixLength = 32; }
{ address = hostConf.ipv4_internal; prefixLength = 24; }
];
ipv6.addresses = [
{ address = hostConf.ipv6; prefixLength = 64; }
];
};
}; };
# List packages installed in system profile # List packages installed in system profile

View File

@ -14,8 +14,6 @@
"::1" "::1"
values.hosts.ildkule.ipv4 values.hosts.ildkule.ipv4
values.hosts.ildkule.ipv6 values.hosts.ildkule.ipv6
values.hosts.ildkule.ipv4_global
values.hosts.ildkule.ipv6_global
]; ];
}; };

View File

@ -30,11 +30,10 @@ in rec {
ipv6 = pvv-ipv6 168; ipv6 = pvv-ipv6 168;
}; };
ildkule = { ildkule = {
ipv4 = "10.212.25.209"; ipv4 = "129.241.153.213";
ipv6 = "2001:700:300:6025:f816:3eff:feee:812d"; ipv4_internal = "192.168.12.209";
ipv4_internal_gw = "192.168.12.1";
ipv4_global = "129.241.153.213"; ipv6 = "2001:700:300:6026:f816:3eff:fe58:f1e8";
ipv6_global = "2001:700:300:6026:f816:3eff:fe58:f1e8";
}; };
bicep = { bicep = {
ipv4 = pvv-ipv4 209; ipv4 = pvv-ipv4 209;
@ -66,11 +65,11 @@ in rec {
}; };
defaultNetworkConfig = { defaultNetworkConfig = {
networkConfig.IPv6AcceptRA = "no"; dns = [ "129.241.0.200" "129.241.0.201" "2001:700:300:1900::200" "2001:700:300:1900::201" ];
gateway = [ hosts.gateway ];
dns = [ "129.241.0.200" "129.241.0.201" ];
domains = [ "pvv.ntnu.no" "pvv.org" ]; domains = [ "pvv.ntnu.no" "pvv.org" ];
gateway = [ hosts.gateway ];
networkConfig.IPv6AcceptRA = "no";
DHCP = "no"; DHCP = "no";
}; };
} }