mir/openvswitch
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-10-19 14:37:21 +00:00
Code Issues Releases Wiki Activity

xenserver: Fix failure to bring up secondary management interfaces.

Browse Source 
When a secondary management interface is configured on a XenServer,
interface-reconfigure would fail to bring it up because it would attempt
to add a bridge that already exists.  This commit makes it tolerate that
situation.
This commit is contained in:
Ben Pfaff
2010-02-09 11:17:16 -08:00
parent bb1c67c813
commit 7b09e42666
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
xenserver/opt_xensource_libexec_InterfaceReconfigureVswitch.py
View File

@@ -1,5 +1,5 @@
# Copyright (c) 2008,2009 Citrix Systems, Inc. # Copyright (c) 2008,2009 Citrix Systems, Inc.
# Copyright (c) 2009 Nicira Networks. # Copyright (c) 2009,2010 Nicira Networks.
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License as published # it under the terms of the GNU Lesser General Public License as published
@@ -265,9 +265,9 @@ def configure_datapath(pif, parent=None, vlan=None):
vsctl_argv += datapath_deconfigure_physical(dev) vsctl_argv += datapath_deconfigure_physical(dev)
if parent and datapath: if parent and datapath:
vsctl_argv += ['--', 'add-br', bridge, parent, vlan] vsctl_argv += ['--', '--may-exist', 'add-br', bridge, parent, vlan]
else: else:
vsctl_argv += ['--', 'add-br', bridge] vsctl_argv += ['--', '--may-exist', 'add-br', bridge]
if len(physical_devices) > 1: if len(physical_devices) > 1:
vsctl_argv += ['# deconfigure bond %s' % pif_netdev_name(pif)] vsctl_argv += ['# deconfigure bond %s' % pif_netdev_name(pif)]
@@ -278,7 +278,7 @@ def configure_datapath(pif, parent=None, vlan=None):
else: else:
iface = pif_netdev_name(physical_devices[0]) iface = pif_netdev_name(physical_devices[0])
vsctl_argv += ['# add physical device %s' % iface] vsctl_argv += ['# add physical device %s' % iface]
vsctl_argv += ['--', 'add-port', bridge, iface] vsctl_argv += ['--', '--may-exist', 'add-port', bridge, iface]
return vsctl_argv,extra_up_ports return vsctl_argv,extra_up_ports