From: Ben Pfaff <blp@nicira.com>
Date: Tue, 30 Mar 2010 16:02:06 +0000 (-0700)
Subject: openvswitch-cfg-update: Fix "set-ssl" command arguments.
X-Git-Tag: v1.0.0~210
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=90056dc0a0836b1668ef8fdd971360bbedc3b035;p=sliver-openvswitch.git

openvswitch-cfg-update: Fix "set-ssl" command arguments.

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>
---

diff --git a/xenserver/etc_xapi.d_plugins_openvswitch-cfg-update b/xenserver/etc_xapi.d_plugins_openvswitch-cfg-update
index 8314a1b62..b573b035d 100755
--- a/xenserver/etc_xapi.d_plugins_openvswitch-cfg-update
+++ b/xenserver/etc_xapi.d_plugins_openvswitch-cfg-update
@@ -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"'])