diff options
| author | Andrew Evans <aevans@nicira.com> | 2011-02-07 14:41:09 -0800 |
|---|---|---|
| committer | Andrew Evans <aevans@nicira.com> | 2011-02-08 10:44:12 -0800 |
| commit | 9cef6345b7f0d8981e00a5fabee59697d817cf3c (patch) | |
| tree | e59f7cfba38de563e7376e97bb5b4e858352066d /xenserver | |
| parent | ed71f80bec1d8f3c6e2e0fcf91ec6998a0fa557a (diff) | |
| download | openvswitch-9cef6345b7f0d8981e00a5fabee59697d817cf3c.tar.gz | |
xenserver: Make openvswitch-cfg-update reset 'manager_options' column.
Diffstat (limited to 'xenserver')
| -rwxr-xr-x | xenserver/etc_xapi.d_plugins_openvswitch-cfg-update | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/xenserver/etc_xapi.d_plugins_openvswitch-cfg-update b/xenserver/etc_xapi.d_plugins_openvswitch-cfg-update index 5189d0436..721fe6476 100755 --- a/xenserver/etc_xapi.d_plugins_openvswitch-cfg-update +++ b/xenserver/etc_xapi.d_plugins_openvswitch-cfg-update @@ -128,8 +128,7 @@ def update(session, args): return "No change to configuration" def vswitchCurrentController(): - controller = vswitchCfgQuery(["get", "Open_vSwitch", - ".", "managers"]).strip('[]"') + controller = vswitchCfgQuery(["get-manager"]) if controller == "": return controller if len(controller) < 4 or controller[0:4] != "ssl:": @@ -138,20 +137,19 @@ def vswitchCurrentController(): return controller.split(':')[1] def removeControllerCfg(): - vswitchCfgMod(["--", "clear", "Open_vSwitch", ".", "managers", + vswitchCfgMod(["--", "del-manager", "--", "del-ssl"]) def setControllerCfg(controller): # /etc/xensource/xapi-ssl.pem is mentioned twice below because it # contains both the private key and the certificate. - vswitchCfgMod(["--", "clear", "Open_vSwitch", ".", "managers", + vswitchCfgMod(["--", "del-manager", "--", "del-ssl", "--", "--bootstrap", "set-ssl", "/etc/xensource/xapi-ssl.pem", "/etc/xensource/xapi-ssl.pem", cacert_filename, - "--", "set", "Open_vSwitch", ".", - 'managers="ssl:' + controller + ':6632"']) + "--", "set-manager", 'ssl:' + controller + ':6632']) def vswitchCfgQuery(action_args): cmd = [vsctl, "--timeout=5", "-vANY:console:emer"] + action_args |