git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
xenserver: Allow fail_mode to be set from xapi.
[sliver-openvswitch.git]
/
xenserver
/
opt_xensource_libexec_InterfaceReconfigureVswitch.py
diff --git
a/xenserver/opt_xensource_libexec_InterfaceReconfigureVswitch.py
b/xenserver/opt_xensource_libexec_InterfaceReconfigureVswitch.py
index
5be7461
..
8429358
100644
(file)
--- a/
xenserver/opt_xensource_libexec_InterfaceReconfigureVswitch.py
+++ b/
xenserver/opt_xensource_libexec_InterfaceReconfigureVswitch.py
@@
-331,6
+331,12
@@
def configure_datapath(pif):
vsctl_argv += ['--', 'set', 'Bridge', bridge,
'other-config:hwaddr=%s' % vsctl_escape(db().get_pif_record(pif)['MAC'])]
vsctl_argv += ['--', 'set', 'Bridge', bridge,
'other-config:hwaddr=%s' % vsctl_escape(db().get_pif_record(pif)['MAC'])]
+ pool = db().get_pool_record()
+ fail_mode = pool['other_config']['vswitch-controller-fail-mode']
+
+ 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]
vsctl_argv += set_br_external_ids(pif)
vsctl_argv += ['## done configuring datapath %s' % bridge]