[ovs-dev] [PATCH] xenserver: Don't require other-config:disable-in-band to exist.

[Ben Pfaff]

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 <henrik at nicira.com>
Bug #5056.
---
 .../etc_xapi.d_plugins_openvswitch-cfg-update      |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/xenserver/etc_xapi.d_plugins_openvswitch-cfg-update b/xenserver/etc_xapi.d_plugins_openvswitch-cfg-update
index e1c8546..f001d2f 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.
-- 
1.7.1