summaryrefslogtreecommitdiff
path: root/xenserver
diff options
context:
space:
mode:
authorEthan Jackson <ethan@nicira.com>2011-01-19 17:57:08 -0800
committerEthan Jackson <ethan@nicira.com>2011-01-19 18:12:01 -0800
commitc2875f43a2de6e3d8c31b63601aa136c64a1053e (patch)
treee5ec2a9bc813f899cbb0689949ee853c41622493 /xenserver
parentef035eeff6bbfae11fe3d0c9afdf390ce7050386 (diff)
downloadopenvswitch-c2875f43a2de6e3d8c31b63601aa136c64a1053e.tar.gz
xenserver: Fix interface reconfigure crash when setting fail_mode.
Interface reconfigure can crash when setting fail_mode if an expected other_config setting is not set.
Diffstat (limited to 'xenserver')
-rw-r--r--xenserver/opt_xensource_libexec_InterfaceReconfigureVswitch.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/xenserver/opt_xensource_libexec_InterfaceReconfigureVswitch.py b/xenserver/opt_xensource_libexec_InterfaceReconfigureVswitch.py
index a3d4bd24d..22201ae27 100644
--- a/xenserver/opt_xensource_libexec_InterfaceReconfigureVswitch.py
+++ b/xenserver/opt_xensource_libexec_InterfaceReconfigureVswitch.py
@@ -334,7 +334,7 @@ def configure_datapath(pif):
pool = db().get_pool_record()
if pool:
- fail_mode = pool['other_config']['vswitch-controller-fail-mode']
+ fail_mode = pool['other_config'].get('vswitch-controller-fail-mode')
else:
fail_mode = 'standalone'