bgpwtf: edge01: bump nixpkgs, use networkd
Change-Id: I038f9518e090aecc90f464475f29c5b3c1570eff
Reviewed-on: https://gerrit.hackerspace.pl/c/hscloud/+/1339
Reviewed-by: implr <implr@hackerspace.pl>
diff --git a/bgpwtf/machines/modules/gretap.nix b/bgpwtf/machines/modules/gretap.nix
index f4e1a7b..f28d64c 100644
--- a/bgpwtf/machines/modules/gretap.nix
+++ b/bgpwtf/machines/modules/gretap.nix
@@ -41,22 +41,28 @@
config.boot.kernelModules = [ "fou" ];
config.systemd.services = mapAttrs' (name: value: nameValuePair "${name}-gretap" {
- wants = [
+ wants = if config.networking.useNetworkd then [
+ "systemd-networkd.service"
+ ] else [
"${name}-netdev.service"
"network-addresses-${value.parent}.service"
];
- after = [
+ after = if config.networking.useNetworkd then [
+ "systemd-networkd.service"
+ ] else [
"network-addresses-${value.parent}.service"
];
- before = [
+ before = if config.networking.useNetworkd then [] else [
"network-addresses-${name}.service"
];
- wantedBy = [
+ wantedBy = if config.networking.useNetworkd then [
+ "network-online.target"
+ ] else [
"network-addresses-${name}.service"
];
serviceConfig = {
Type = "oneshot";
- ExecStart = "${pkgs.iproute}/bin/ip link add name ${name} type gretap remote ${value.remoteV4} local ${value.localV4} key ${toString value.id}";
+ ExecStart = "${pkgs.iproute2}/bin/ip link add name ${name} type gretap remote ${value.remoteV4} local ${value.localV4} key ${toString value.id}";
};
}) cfg.interfaces;
}