Merge master into staging-next

2020-10-14 11:32:49 +02:00
parent 9e1943edc0 ffde8a8e1e
commit b981eca057
49 changed files with 901 additions and 556 deletions
@@ -38,14 +38,14 @@ in {
          matchConfig.Name = "vrf1";
          networkConfig.IPForward = "yes";
          routes = [
-            { routeConfig = { Destination = "192.168.1.2"; Metric = "100"; }; }
+            { routeConfig = { Destination = "192.168.1.2"; Metric = 100; }; }
          ];
        };
        networks."10-vrf2" = {
          matchConfig.Name = "vrf2";
          networkConfig.IPForward = "yes";
          routes = [
-            { routeConfig = { Destination = "192.168.2.3"; Metric = "100"; }; }
+            { routeConfig = { Destination = "192.168.2.3"; Metric = 100; }; }
          ];
        };