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),
vsctl_argv += ['--', 'set', 'Bridge', bridge,
'other-config:hwaddr=%s' % vsctl_escape(db().get_pif_record(pif)['MAC'])]
+ pool = db().get_pool_record()
+ network = db().get_network_by_bridge(bridge)
+ fail_mode = None
+ valid_fail_modes = ['standalone', 'secure']
+
+ if network:
+ network_rec = db().get_network_record(network)
+ fail_mode = network_rec['other_config'].get('vswitch-controller-fail-mode')
+
+ if (fail_mode not in valid_fail_modes) and pool:
+ fail_mode = pool['other_config'].get('vswitch-controller-fail-mode')
+
+ if fail_mode not in valid_fail_modes:
+ fail_mode = 'standalone'
+
+ vsctl_argv += ['--', 'set', 'Bridge', bridge, 'fail_mode=%s' % fail_mode]
+
vsctl_argv += set_br_external_ids(pif)
vsctl_argv += ['## done configuring datapath %s' % bridge]