Merge pull request #95 from robhoes/ca234506

CA-234506: Don't lose the port `kind` param in bridge.make_config
xapi-project · Dec 2, 2016 · a2d63c7 · a2d63c7
2 parents 95f5d8a + 1836c1b
commit a2d63c7
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/networkd/network_server.ml b/networkd/network_server.ml
@@ -891,8 +891,8 @@ module Bridge = struct
 				update_config bridge_name c;
 				exec (fun () ->
 					create () dbg ?vlan ?mac:bridge_mac ~other_config ~name:bridge_name ();
-					List.iter (fun (port_name, {interfaces; bond_properties; bond_mac}) ->
-						add_port () dbg ?bond_mac ~bridge:bridge_name ~name:port_name ~interfaces ~bond_properties ()
+					List.iter (fun (port_name, {interfaces; bond_properties; bond_mac; kind}) ->
+						add_port () dbg ?bond_mac ~bridge:bridge_name ~name:port_name ~interfaces ~bond_properties ~kind ()
 					) ports
 				)
 			) config