xenserver: Don't require other-config:disable-in-band to exist.
authorBen Pfaff <blp@nicira.com>
Mon, 21 Mar 2011 21:39:45 +0000 (14:39 -0700)
committerBen Pfaff <blp@nicira.com>
Mon, 21 Mar 2011 21:39:45 +0000 (14:39 -0700)
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@nicira.com>
Bug #5056.

xenserver/etc_xapi.d_plugins_openvswitch-cfg-update

index e1c854610ea679fb27a07cde81e697648ad4839c..f001d2f61706cdac56863870cfb48a6b960de582 100755 (executable)
@@ -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.