Added bridge interfaces (#50)

dd-ix · Jan 14, 2024 · 4a08425 · 4a08425
1 parent d98d89b
commit 4a08425
Showing 1 changed file with 69 additions and 27 deletions.
diff --git a/hosts/mno001/network.nix b/hosts/mno001/network.nix
@@ -41,29 +41,51 @@ in
         };
       };
 
-      "20-svc-management" = {
+      # 20-${bond_device_name}.100
+      "20-uplink" = {
         netdevConfig = {
-          Name = "svc-management";
+          # ${bond_device_name}.100
+          Name = "uplink";
           Kind = "vlan";
         };
         vlanConfig = {
-          Id = 102;
+          Id = 100;
         };
       };
 
-      "20-uplink" = {
+      "20-svc-internet".netdevConfig = {
+        Name = "svc-internet";
+        Kind = "bridge";
+      };
+
+      "20-${bond_device_name}.101" = {
         netdevConfig = {
-          Name = "uplink";
+          Name = "${bond_device_name}.101";
           Kind = "vlan";
         };
         vlanConfig = {
-          Id = 100;
+          Id = 101;
         };
       };
 
-      "30-microvm-inet".netdevConfig = {
+      "20-svc-services".netdevConfig = {
+        Name = "svc-services";
+        Kind = "bridge";
+      };
+
+      "20-${bond_device_name}.102" = {
+        netdevConfig = {
+          Name = "${bond_device_name}.102";
+          Kind = "vlan";
+        };
+        vlanConfig = {
+          Id = 102;
+        };
+      };
+
+      "20-svc-management".netdevConfig = {
+        Name = "svc-management";
         Kind = "bridge";
-        Name = "microvm-inet";
       };
     };
 
@@ -78,43 +100,63 @@ in
         };
       };
 
-      "10-svc-management" = {
-        matchConfig.Name = "svc-management";
-        address = [ "2a01:7700:80b0:7000::1/64" ];
+      "10-${first_device_name}-${bond_device_name}" = {
+        matchConfig.Name = "${first_device_name}";
+        networkConfig = {
+          Bond = "${bond_device_name}"; # Enslaving to bond 
+        };
       };
 
+      "10-${second_device_name}-${bond_device_name}" = {
+        matchConfig.Name = "${second_device_name}";
+        networkConfig = {
+          Bond = "${bond_device_name}"; # Enslaving to bond
+        };
+      };
+
+      #"10-${bond_device_name}.100" = {
+      #  matchConfig.Name = "${bond_device_name}.100";
+      #  networkConfig.Bridge = "svc-internet";
+      #};
+
+      #10-svc-internet
       "10-uplink" = {
+        #10-svc-internet
         matchConfig.Name = "uplink";
 
         address = [ "212.111.245.178/29" ];
         routes = [
           { routeConfig.Gateway = "212.111.245.177"; }
         ];
 
+        # remove
         vlan = [ "uplink" ];
+      };
 
-        networkConfig = {
-          DHCP = "no";
-        };
+      "30-microvm-svc-internet" = {
+        matchConfig.Name = "vm-inet-*";
+        networkConfig.Bridge = "svc-internet";
       };
 
-      "10-${first_device_name}-${bond_device_name}" = {
-        matchConfig.Name = "${first_device_name}";
-        networkConfig = {
-          Bond = "${bond_device_name}"; # Enslaving to bond 
-        };
+      "10-${bond_device_name}.101" = {
+        matchConfig.Name = "${bond_device_name}.101";
+        networkConfig.Bridge = "svc-services";
       };
 
-      "10-${second_device_name}-${bond_device_name}" = {
-        matchConfig.Name = "${second_device_name}";
-        networkConfig = {
-          Bond = "${bond_device_name}"; # Enslaving to bond
-        };
+      "30-microvm-svc-services" = {
+        matchConfig.Name = "vm-srv-*";
+        networkConfig.Bridge = "svc-services";
       };
 
-      "30-microvm-inet" = {
-        matchConfig.Name = "vm-inet-*";
-        networkConfig.Bridge = "microvm-inet";
+      "10-${bond_device_name}.102" = {
+        matchConfig.Name = "${bond_device_name}.102";
+        networkConfig.Bridge = "svc-management";
+      };
+
+      "10-svc-management" = {
+        matchConfig.Name = "svc-management";
+        address = [ "2a01:7700:80b0:7000::1/64" ];
+        #routes = [ { routeConfig.Gateway = "fe80::defa"; } ];
       };
     };
   };