git://git.onelab.eu
/
sliver-openvswitch.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
ed71f80
)
xenserver: Make openvswitch-cfg-update reset 'manager_options' column.
author
Andrew Evans
<aevans@nicira.com>
Mon, 7 Feb 2011 22:41:09 +0000
(14:41 -0800)
committer
Andrew Evans
<aevans@nicira.com>
Tue, 8 Feb 2011 18:44:12 +0000
(10:44 -0800)
xenserver/etc_xapi.d_plugins_openvswitch-cfg-update
patch
|
blob
|
history
diff --git
a/xenserver/etc_xapi.d_plugins_openvswitch-cfg-update
b/xenserver/etc_xapi.d_plugins_openvswitch-cfg-update
index
5189d04
..
721fe64
100755
(executable)
--- 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():
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:":
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():
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.
"--", "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,
"--", "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
def vswitchCfgQuery(action_args):
cmd = [vsctl, "--timeout=5", "-vANY:console:emer"] + action_args