X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=xenserver%2Fopt_xensource_libexec_interface-reconfigure;h=6c6de9f35c849b902be1972b4eab22c63944c2ed;hb=87378a8770f54f1efaf91920077c65c45398f227;hp=f756bab7bc30350a26912766b071ca1eb667a5af;hpb=5f55c39b21e69025045437ffbd3bb98fe6ce2e89;p=sliver-openvswitch.git
diff --git a/xenserver/opt_xensource_libexec_interface-reconfigure b/xenserver/opt_xensource_libexec_interface-reconfigure
index f756bab7b..6c6de9f35 100755
--- a/xenserver/opt_xensource_libexec_interface-reconfigure
+++ b/xenserver/opt_xensource_libexec_interface-reconfigure
@@ -50,6 +50,7 @@ import syslog
import traceback
import re
import random
+import syslog
management_pif = None
@@ -144,10 +145,11 @@ def netdev_remap_name(pif, already_renamed=[]):
return None
def rename_netdev(old_name, new_name):
- log("Changing the name of %s to %s" % (old_name, new_name))
- run_command(['/sbin/ifconfig', old_name, 'down'])
- if not run_command(['/sbin/ip', 'link', 'set', old_name, 'name', new_name]):
- raise Error("Could not rename %s to %s" % (old_name, new_name))
+ raise Error("Trying to rename %s to %s - This functionality has been removed" % (old_name, new_name))
+ # log("Changing the name of %s to %s" % (old_name, new_name))
+ # run_command(['/sbin/ifconfig', old_name, 'down'])
+ # if not run_command(['/sbin/ip', 'link', 'set', old_name, 'name', new_name]):
+ # raise Error("Could not rename %s to %s" % (old_name, new_name))
pifrec = db().get_pif_record(pif)
device = pifrec['device']
@@ -197,13 +199,19 @@ def ifup(netdev):
"""Bring up a network interface"""
if not os.path.exists(root_prefix() + "/etc/sysconfig/network-scripts/ifcfg-%s" % netdev):
raise Error("ifup: device %s exists but ifcfg-%s does not" % (netdev,netdev))
+ d = os.getenv("DHCLIENTARGS","")
+ if os.path.exists("/etc/firstboot.d/data/firstboot_in_progress"):
+ os.putenv("DHCLIENTARGS", d + " -T 240 " )
run_command(["/sbin/ifup", netdev])
+ os.putenv("DHCLIENTARGS", d )
#
#
#
def pif_rename_physical_devices(pif):
+ if pif_is_tunnel(pif):
+ return
if pif_is_vlan(pif):
pif = pif_get_vlan_slave(pif)
@@ -267,6 +275,7 @@ def ipdev_open_ifcfg(pif):
f.write("XEMANAGED=yes\n")
f.write("DEVICE=%s\n" % ipdev)
f.write("ONBOOT=no\n")
+ f.write("NOZEROCONF=yes\n")
return f
@@ -354,6 +363,10 @@ def ipdev_configure_network(pif, dp):
pifs_on_host = [p for p in db().get_all_pifs() if not p in pif_get_bond_masters(pif)]
+ # now prune out bond slaves as they are not connected to the IP
+ # stack and so cannot be used as gateway or DNS devices.
+ pifs_on_host = [ p for p in pifs_on_host if len(pif_get_bond_masters(p)) == 0]
+
# loop through all the pifs on this host looking for one with
# other-config:peerdns = true, and one with
# other-config:default-route=true
@@ -415,7 +428,7 @@ def action_up(pif, force):
pifrec = db().get_pif_record(pif)
ipdev = pif_ipdev_name(pif)
- dp = DatapathFactory(pif)
+ dp = DatapathFactory()(pif)
log("action_up: %s" % ipdev)
@@ -455,7 +468,7 @@ def action_up(pif, force):
def action_down(pif):
ipdev = pif_ipdev_name(pif)
- dp = DatapathFactory(pif)
+ dp = DatapathFactory()(pif)
log("action_down: %s" % ipdev)
@@ -463,6 +476,9 @@ def action_down(pif):
dp.bring_down()
+def action_rewrite():
+ DatapathFactory().rewrite()
+
# This is useful for reconfiguring the mgmt interface after having lost connectivity to the pool master
def action_force_rewrite(bridge, config):
def getUUID():
@@ -522,6 +538,8 @@ def action_force_rewrite(bridge, config):
f.write('\t\t\n')
f.write('\t\tOpaqueRef:NULL\n')
f.write('\t\t-1\n')
+ f.write('\t\t\n')
+ f.write('\t\t\n')
f.write('\t\t%s\n' % interface)
f.write('\t\t%s\n' % mac)
f.write('\t\t\n')
@@ -666,7 +684,7 @@ def main(argv=None):
pif = db().get_pif_by_uuid(pif_uuid)
if action == "rewrite":
- pass
+ action_rewrite()
else:
if not pif:
raise Usage("No PIF given")