From 2576975552851665507a715ca6de9ed6c4efd95b Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Mon, 21 Mar 2011 14:39:45 -0700 Subject: [PATCH] xenserver: Don't require other-config:disable-in-band to exist. other-config:disable-in-band is optional but the ovs-vsctl "get" command by default requires its target to exist. Adding --if-exists allows it to be missing. Reported-by: Henrik Amren Bug #5056. --- xenserver/etc_xapi.d_plugins_openvswitch-cfg-update | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xenserver/etc_xapi.d_plugins_openvswitch-cfg-update b/xenserver/etc_xapi.d_plugins_openvswitch-cfg-update index e1c85461..f001d2f6 100755 --- a/xenserver/etc_xapi.d_plugins_openvswitch-cfg-update +++ b/xenserver/etc_xapi.d_plugins_openvswitch-cfg-update @@ -99,7 +99,8 @@ def update(session, args): if not xapi_dib: xapi_dib = '' - ovs_dib = vswitchCfgQuery(['get', 'Bridge', bridge, + ovs_dib = vswitchCfgQuery(['--', '--if-exists', 'get', 'Bridge', + bridge, 'other_config:disable-in-band']).strip('"') # Do nothing if setting is invalid, and warn the user. -- 2.30.2