Cleanup default file locations and XenServer packaging

[sliver-openvswitch.git] / xenserver / etc_xapi.d_plugins_openvswitch-cfg-update

diff --git a/xenserver/etc_xapi.d_plugins_vswitch-cfg-update b/xenserver/etc_xapi.d_plugins_openvswitch-cfg-update
similarity index 93%
rename from xenserver/etc_xapi.d_plugins_vswitch-cfg-update
rename to xenserver/etc_xapi.d_plugins_openvswitch-cfg-update
index 4cf2d88..8314a1b 100755 (executable)
--- a/xenserver/etc_xapi.d_plugins_vswitch-cfg-update
+++ b/xenserver/etc_xapi.d_plugins_openvswitch-cfg-update
@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 #
 # xapi plugin script to update the cache of configuration items in the
-# ovs-vswitchd configuration file that are managed in the xapi database
-# when integrated with Citrix management tools.
+# ovs-vswitchd configuration that are managed in the xapi database when 
+# integrated with Citrix management tools.
 
 # Copyright (C) 2009, 2010 Nicira Networks, Inc.
 #
@@ -27,7 +27,7 @@ import os
 import subprocess
 
 vsctl="/usr/bin/ovs-vsctl"
-cacert_filename="/etc/ovs-vswitchd.cacert"
+cacert_filename="/etc/openvswitch/vswitchd.cacert"
 
 # Delete the CA certificate, so that we go back to boot-strapping mode
 def delete_cacert():
@@ -80,8 +80,7 @@ def setControllerCfg(controller):
                    "--", "del-ssl",
                    "--", "--bootstrap", "set-ssl",
                    "/etc/xensource/xapi-ssl.pem",
-                   "/etc/xensource/xapi-ssl.pem",
-                   "/etc/ovs-vswitchd.cacert",
+                   cacert_filename,
                    "--", "set", "Open_vSwitch", ".",
                    'managers="ssl:' + controller + ':6632"'])