felixalb/pvv-nixos-config
1
0
Fork 0
mirror of https://git.pvv.ntnu.no/Drift/pvv-nixos-config.git synced 2025-10-31 01:08:03 +01:00
Code Issues Projects Releases Wiki Activity

Openstack: Add ipv6, clean up config

Browse Source
This commit is contained in:
Felix Albrigtsen 2024-07-29 15:09:42 +02:00
parent 381d5b6734
commit 4b3d3709b5
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hosts/ildkule/configuration.nix
View File

@ -25,15 +25,21 @@
systemd.network.networks."30-ntnu-global" = values.openstackGlobalNetworkConfig // { systemd.network.networks."30-ntnu-global" = values.openstackGlobalNetworkConfig // {
matchConfig.Name = "ens4"; matchConfig.Name = "ens4";
# Add the global address in addition to the local address learned from DHCP # Add the global addresses in addition to the local address learned from DHCP
addresses = [ addresses = [
{ addressConfig.Address = "${values.hosts.ildkule.ipv4_global}/32"; } { addressConfig.Address = "${values.hosts.ildkule.ipv4_global}/32"; }
{ addressConfig.Address = "${values.hosts.ildkule.ipv6_global}/128"; }
]; ];
}; };
# Secondary connection only for use within the university network # Secondary connection only for use within the university network
systemd.network.networks."40-ntnu-internal" = values.openstackLocalNetworkConfig // { systemd.network.networks."40-ntnu-internal" = values.openstackLocalNetworkConfig // {
matchConfig.Name = "ens3"; matchConfig.Name = "ens3";
# Add the ntnu-internal addresses in addition to the local address learned from DHCP
addresses = [
{ addressConfig.Address = "${values.hosts.ildkule.ipv4}/32"; }
{ addressConfig.Address = "${values.hosts.ildkule.ipv6}/128"; }
];
}; };
# List packages installed in system profile # List packages installed in system profile

14
values.nix
View File

@ -74,7 +74,7 @@ in rec {
}; };
openstackGlobalNetworkConfig = { openstackGlobalNetworkConfig = {
networkConfig.IPv6AcceptRA = "no"; networkConfig.IPv6AcceptRA = "yes";
dns = [ "129.241.0.200" "129.241.0.201" ]; dns = [ "129.241.0.200" "129.241.0.201" ];
domains = [ "pvv.ntnu.no" "pvv.org" ]; domains = [ "pvv.ntnu.no" "pvv.org" ];
DHCP = "yes"; DHCP = "yes";
@ -85,15 +85,13 @@ in rec {
dns = [ "129.241.0.200" "129.241.0.201" ]; dns = [ "129.241.0.200" "129.241.0.201" ];
domains = [ "pvv.ntnu.no" "pvv.org" ]; domains = [ "pvv.ntnu.no" "pvv.org" ];
DHCP = "yes"; DHCP = "yes";
# Only use this network for link-local networking, not global/default routes
dhcpV4Config.UseRoutes = "no";
routes = [ routes = [
{ { routeConfig.Destination = "10.0.0.0/8"; }
routeConfig.Destination = "10.0.0.0/8";
}
]; ];
linkConfig.RequiredForOnline = "no"; linkConfig.RequiredForOnline = "no";
dhcpV4Config = {
# Only use this network for link-local networking, no global/default routes
UseRoutes = "no";
};
}; };
} }