Use a well-known bridge name for the host internal management network

ocaml/xapi/create_networks.ml

@@ -25,13 +25,16 @@ let internal_management_network_oc =
 		"ip_end", "169.254.255.254";
 		"netmask", "255.255.0.0"
 	]
+(* We use a well-known name for the internal management interface *)
+let internal_management_bridge = "xenapi"
 
 let create_guest_installer_network ~__context =
 	if try ignore(Helpers.get_host_internal_management_network ~__context); false with _ -> true then begin
 		(* The new "host internal management network" is created with both other_config keys *)
 		let h' = Xapi_network.create ~__context ~name_label:internal_management_network_name
 			~name_description:internal_management_network_desc ~mTU:1500L
 			~other_config:internal_management_network_oc ~tags:[] in
+		Db.Network.set_bridge ~__context ~self:h' ~value:internal_management_bridge;
 		debug "Created new host internal management network: %s" (Ref.string_of h');
 	end
 

ocaml/xapi/create_networks.mli

@@ -24,5 +24,8 @@ val internal_management_network_desc : string
 (** The other_config of the internal management network *)
 val internal_management_network_oc : (string * string) list
 
+(** The well-known bridge name *)
+val internal_management_bridge : string
+
 (** Create a host internal management network (if it does not exist yet). *)
 val create_networks_localhost : unit -> unit

ocaml/xapi/xapi_db_upgrade.ml

@@ -205,6 +205,7 @@ let upgrade_guest_installer_network = {
 					Db.Network.set_name_label ~__context ~self ~value:Create_networks.internal_management_network_name;
 					Db.Network.set_name_description ~__context ~self ~value:Create_networks.internal_management_network_desc;
 					Db.Network.set_other_config ~__context ~self ~value:Create_networks.internal_management_network_oc;
+					Db.Network.set_bridge ~__context ~self ~value:Create_networks.internal_management_bridge;
 				end
 			) (Db.Network.get_all ~__context)