openvswitch-cfg-update: Fix "set-ssl" command arguments.
authorBen Pfaff <blp@nicira.com>
Tue, 30 Mar 2010 16:02:06 +0000 (09:02 -0700)
committerBen Pfaff <blp@nicira.com>
Tue, 30 Mar 2010 21:11:52 +0000 (14:11 -0700)
The SSL certificate and the private key are both in
/etc/xensource/xapi-ssl.pem, so it must be mentioned twice in the set-ssl
command invocation.

Bug accidentally introduced in commit bc391960 "Cleanup default file
locations and XenServer packaging".

Reported-by: Peter Balland <peter@nicira.com>
Tested-by: Peter Balland <peter@nicira.com>
xenserver/etc_xapi.d_plugins_openvswitch-cfg-update

index 8314a1b62d657c7994194c347a5782895b77899d..b573b035d00a717a7a7575cb275bb3450b0302b8 100755 (executable)
@@ -80,6 +80,7 @@ def setControllerCfg(controller):
                    "--", "del-ssl",
                    "--", "--bootstrap", "set-ssl",
                    "/etc/xensource/xapi-ssl.pem",
+                   "/etc/xensource/xapi-ssl.pem",
                    cacert_filename,
                    "--", "set", "Open_vSwitch", ".",
                    'managers="ssl:' + controller + ':6632"'])