X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=xenserver%2Fetc_xapi.d_plugins_openvswitch-cfg-update;h=cc97c2d36103a730e827cfa98279a58a9106a03f;hb=e084518ad4e7ce349d23ddda7c74ea8a57ca0f56;hp=bceccbf4cb985f3c6aa31e8fb73c5de354fd617b;hpb=da7198b411d68df604db1a6132cf3be5c21842db;p=sliver-openvswitch.git diff --git a/xenserver/etc_xapi.d_plugins_openvswitch-cfg-update b/xenserver/etc_xapi.d_plugins_openvswitch-cfg-update index bceccbf4c..cc97c2d36 100755 --- a/xenserver/etc_xapi.d_plugins_openvswitch-cfg-update +++ b/xenserver/etc_xapi.d_plugins_openvswitch-cfg-update @@ -93,7 +93,7 @@ def update(session, args): except KeyError: pass - # If new controller, get managagment MAC addresses from XAPI now + # If new controller, get management MAC addresses from XAPI now # in case fail_mode set to secure which may affect XAPI access mgmt_bridge = None host_mgmt_mac = None @@ -215,7 +215,7 @@ def setControllerCfg(controller): "--", "set-manager", 'ssl:' + controller + ':6632']) def vswitchCfgQuery(action_args): - cmd = [vsctl, "--timeout=5", "-vANY:console:emer"] + action_args + cmd = [vsctl, "--timeout=5", "-vANY:console:off"] + action_args output = subprocess.Popen(cmd, stdout=subprocess.PIPE).communicate() if len(output) == 0 or output[0] == None: output = "" @@ -224,7 +224,7 @@ def vswitchCfgQuery(action_args): return output def vswitchCfgMod(action_args): - cmd = [vsctl, "--timeout=5", "-vANY:console:emer"] + action_args + cmd = [vsctl, "--timeout=5", "-vANY:console:off"] + action_args exitcode = subprocess.call(cmd) if exitcode != 0: raise XenAPIPlugin.Failure("VSWITCH_CONFIG_MOD_FAILURE",