Openstack: Add ipv6, clean up config
This commit is contained in:
parent
381d5b6734
commit
4b3d3709b5
|
@ -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
14
values.nix
|
@ -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";
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue