From f1d3dcad844d6deaa4a2cde03fc9c0feb117a95d Mon Sep 17 00:00:00 2001 From: Felix Albrigtsen Date: Mon, 29 Jul 2024 15:09:42 +0200 Subject: [PATCH] Openstack: Add ipv6, clean up config --- hosts/ildkule/configuration.nix | 8 +++++++- values.nix | 14 ++++++-------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/hosts/ildkule/configuration.nix b/hosts/ildkule/configuration.nix index 12ceaa2..276af5a 100644 --- a/hosts/ildkule/configuration.nix +++ b/hosts/ildkule/configuration.nix @@ -25,15 +25,21 @@ systemd.network.networks."30-ntnu-global" = values.openstackGlobalNetworkConfig // { 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 = [ { 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 systemd.network.networks."40-ntnu-internal" = values.openstackLocalNetworkConfig // { 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 diff --git a/values.nix b/values.nix index ba335a3..d16694d 100644 --- a/values.nix +++ b/values.nix @@ -74,7 +74,7 @@ in rec { }; openstackGlobalNetworkConfig = { - networkConfig.IPv6AcceptRA = "no"; + networkConfig.IPv6AcceptRA = "yes"; dns = [ "129.241.0.200" "129.241.0.201" ]; domains = [ "pvv.ntnu.no" "pvv.org" ]; DHCP = "yes"; @@ -85,15 +85,13 @@ in rec { dns = [ "129.241.0.200" "129.241.0.201" ]; domains = [ "pvv.ntnu.no" "pvv.org" ]; DHCP = "yes"; + + # Only use this network for link-local networking, not global/default routes + dhcpV4Config.UseRoutes = "no"; routes = [ - { - routeConfig.Destination = "10.0.0.0/8"; - } + { routeConfig.Destination = "10.0.0.0/8"; } ]; + linkConfig.RequiredForOnline = "no"; - dhcpV4Config = { - # Only use this network for link-local networking, no global/default routes - UseRoutes = "no"; - }; }; }