X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=xenserver%2Fopt_xensource_libexec_InterfaceReconfigureVswitch.py;h=22201ae27007059f7270b5321877890a7346b5b2;hb=75fca0a445ccecbf0b53a44024800860475acf2e;hp=c352594ac86c537b7781a830cf0158335f8c3286;hpb=b13300c7178527f85937604022a755e174a0e1aa;p=openvswitch

diff --git a/xenserver/opt_xensource_libexec_InterfaceReconfigureVswitch.py b/xenserver/opt_xensource_libexec_InterfaceReconfigureVswitch.py
index c352594a..22201ae2 100644
--- a/xenserver/opt_xensource_libexec_InterfaceReconfigureVswitch.py
+++ b/xenserver/opt_xensource_libexec_InterfaceReconfigureVswitch.py
@@ -171,6 +171,28 @@ def datapath_configure_bond(pif,slaves):
                 argv += ['bond_%s=%d' % (name, value)]
             except ValueError:
                 log("bridge %s has invalid %s '%s'" % (bridge, name, value))
+        elif name in ['miimon', 'use_carrier']:
+            try:
+                value = int(val)
+                if value < 0:
+                    raise ValueError
+
+                if name == 'use_carrier':
+                    if value:
+                        value = "carrier"
+                    else:
+                        value = "miimon"
+                    argv += ["other-config:bond-detect-mode=%s" % value]
+                else:
+                    argv += ["other-config:bond-miimon-interval=%d" % value]
+            except ValueError:
+                log("bridge %s has invalid %s '%s'" % (bridge, name, value))
+        elif name == "mode":
+
+            if val in ['balance-slb', 'active-backup']:
+                argv += ['bond_%s=%s' % (name, val)]
+            else:
+                log("bridge %s has invalid %s '%s'" % (bridge, name, val))
         else:
             # Pass other bond options into other_config.
             argv += ["other-config:%s=%s" % (vsctl_escape("bond-%s" % name),
@@ -309,6 +331,16 @@ def configure_datapath(pif):
     vsctl_argv += ['--', 'set', 'Bridge', bridge,
                    'other-config:hwaddr=%s' % vsctl_escape(db().get_pif_record(pif)['MAC'])]
 
+    pool = db().get_pool_record()
+
+    if pool:
+        fail_mode = pool['other_config'].get('vswitch-controller-fail-mode')
+    else:
+        fail_mode = 'standalone'
+
+    if fail_mode in ['standalone', 'secure']:
+        vsctl_argv += ['--', 'set', 'Bridge', bridge, 'fail_mode=%s' % fail_mode]
+
     vsctl_argv += set_br_external_ids(pif)
     vsctl_argv += ['## done configuring datapath %s' % bridge]