From 48fd9221eec4287bcf7eb7d8de7a096a4734ca0d Mon Sep 17 00:00:00 2001 From: Frank Date: Tue, 18 Jan 2011 10:48:30 -0800 Subject: [PATCH] bug 7722: open vswitch - only create ovs stuff when ovs enabled --- .../cloud/network/ovs/OvsNetworkManagerImpl.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/server/src/com/cloud/network/ovs/OvsNetworkManagerImpl.java b/server/src/com/cloud/network/ovs/OvsNetworkManagerImpl.java index 399fbe0964b..070f14877da 100644 --- a/server/src/com/cloud/network/ovs/OvsNetworkManagerImpl.java +++ b/server/src/com/cloud/network/ovs/OvsNetworkManagerImpl.java @@ -110,11 +110,14 @@ public class OvsNetworkManagerImpl implements OvsNetworkManager { throws ConfigurationException { _name = name; _isEnabled = Boolean.parseBoolean(_configDao.getValue(Config.OvsNetwork.key())); - _serverId = ((ManagementServer)ComponentLocator.getComponent(ManagementServer.Name)).getId(); - _executorPool = Executors.newScheduledThreadPool(10, new NamedThreadFactory("OVS")); - _cleanupExecutor = Executors.newScheduledThreadPool(1, new NamedThreadFactory("OVS-Cleanup")); - _ovsListener = new OvsListener(this, _workDao, _tunnelDao, _vlanMappingDao, _hostDao); - _agentMgr.registerForHostEvents(_ovsListener, true, true, true); + + if (_isEnabled) { + _serverId = ((ManagementServer)ComponentLocator.getComponent(ManagementServer.Name)).getId(); + _executorPool = Executors.newScheduledThreadPool(10, new NamedThreadFactory("OVS")); + _cleanupExecutor = Executors.newScheduledThreadPool(1, new NamedThreadFactory("OVS-Cleanup")); + _ovsListener = new OvsListener(this, _workDao, _tunnelDao, _vlanMappingDao, _hostDao); + _agentMgr.registerForHostEvents(_ovsListener, true, true, true); + } return true; }