projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
netdev: Fix memory leak in netdev_open.
[openvswitch]
/
xenserver
/
etc_xapi.d_plugins_vswitch-cfg-update
diff --git
a/xenserver/etc_xapi.d_plugins_vswitch-cfg-update
b/xenserver/etc_xapi.d_plugins_vswitch-cfg-update
index ef4ce782e8f2d17e6a262ebbed0ee7fb20f1a130..7472d1b476fb0298575b933de7cf365857e629b3 100755
(executable)
--- a/
xenserver/etc_xapi.d_plugins_vswitch-cfg-update
+++ b/
xenserver/etc_xapi.d_plugins_vswitch-cfg-update
@@
-21,25
+21,29
@@
# TBD: - error handling needs to be improved. Currently this can leave
# TBD: the system in a bad state if anything goes wrong.
# TBD: - error handling needs to be improved. Currently this can leave
# TBD: the system in a bad state if anything goes wrong.
-import logging
-log = logging.getLogger("vswitch-cfg-update")
-logging.basicConfig(filename="/var/log/vswitch-cfg-update.log", level=logging.DEBUG)
-
import XenAPIPlugin
import XenAPI
import XenAPIPlugin
import XenAPI
+import os
import subprocess
import subprocess
-cfg_mod="/
root/vswitch
/bin/ovs-cfg-mod"
+cfg_mod="/
usr
/bin/ovs-cfg-mod"
vswitchd_cfg_filename="/etc/ovs-vswitchd.conf"
vswitchd_cfg_filename="/etc/ovs-vswitchd.conf"
+cacert_filename="/etc/ovs-vswitchd.cacert"
+
+# Delete the CA certificate, so that we go back to boot-strapping mode
+def delete_cacert():
+ try:
+ os.remove(cacert_filename)
+ except OSError:
+ # Ignore error if file doesn't exist
+ pass
def update(session, args):
pools = session.xenapi.pool.get_all()
# We assume there is only ever one pool...
if len(pools) == 0:
def update(session, args):
pools = session.xenapi.pool.get_all()
# We assume there is only ever one pool...
if len(pools) == 0:
- log.error("No pool for host.")
raise XenAPIPlugin.Failure("NO_POOL_FOR_HOST", [])
if len(pools) > 1:
raise XenAPIPlugin.Failure("NO_POOL_FOR_HOST", [])
if len(pools) > 1:
- log.error("More than one pool for host.")
raise XenAPIPlugin.Failure("MORE_THAN_ONE_POOL_FOR_HOST", [])
pool = session.xenapi.pool.get_record(pools[0])
try:
raise XenAPIPlugin.Failure("MORE_THAN_ONE_POOL_FOR_HOST", [])
pool = session.xenapi.pool.get_record(pools[0])
try:
@@
-48,26
+52,21
@@
def update(session, args):
controller = ""
currentController = vswitchCurrentController()
if controller == "" and currentController != "":
controller = ""
currentController = vswitchCurrentController()
if controller == "" and currentController != "":
-
log.debug("Removing controller configuration."
)
+
delete_cacert(
)
removeControllerCfg()
return "Successfully removed controller config"
elif controller != currentController:
removeControllerCfg()
return "Successfully removed controller config"
elif controller != currentController:
- if len(controller) == 0:
- log.debug("Setting controller to: %s" % (controller))
- else:
- log.debug("Changing controller from %s to %s" % (currentController, controller))
+ delete_cacert()
setControllerCfg(controller)
return "Successfully set controller to " + controller
else:
setControllerCfg(controller)
return "Successfully set controller to " + controller
else:
- log.debug("No change to controller configuration required.")
- return "No change to configuration"
+ return "No change to configuration"
def vswitchCurrentController():
controller = vswitchCfgQuery("mgmt.controller")
if controller == "":
return controller
if len(controller) < 4 or controller[0:4] != "ssl:":
def vswitchCurrentController():
controller = vswitchCfgQuery("mgmt.controller")
if controller == "":
return controller
if len(controller) < 4 or controller[0:4] != "ssl:":
- log.warning("Controller does not specify ssl connection type, returning entire string.")
return controller
else:
return controller[4:]
return controller
else:
return controller[4:]
@@
-105,8
+104,6
@@
def vswitchCfgMod(action_args):
"--config-file=" + vswitchd_cfg_filename] + action_args
exitcode = subprocess.call(cmd)
if exitcode != 0:
"--config-file=" + vswitchd_cfg_filename] + action_args
exitcode = subprocess.call(cmd)
if exitcode != 0:
- log.error("ovs-cfg-mod failed with exit code "
- + str(exitcode) + " for " + repr(action_args))
raise XenAPIPlugin.Failure("VSWITCH_CONFIG_MOD_FAILURE",
[ str(exitcode) , str(action_args) ])
vswitchReload()
raise XenAPIPlugin.Failure("VSWITCH_CONFIG_MOD_FAILURE",
[ str(exitcode) , str(action_args) ])
vswitchReload()
@@
-114,7
+111,6
@@
def vswitchCfgMod(action_args):
def vswitchReload():
exitcode = subprocess.call(["/sbin/service", "vswitch", "reload"])
if exitcode != 0:
def vswitchReload():
exitcode = subprocess.call(["/sbin/service", "vswitch", "reload"])
if exitcode != 0:
- log.error("vswitch reload failed with exit code " + str(exitcode))
raise XenAPIPlugin.Failure("VSWITCH_CFG_RELOAD_FAILURE", [ str(exitcode) ])
raise XenAPIPlugin.Failure("VSWITCH_CFG_RELOAD_FAILURE", [ str(exitcode) ])