You are viewing a plain text version of this content. The canonical link for it is here.
Posted to tashi-commits@incubator.apache.org by mr...@apache.org on 2009/05/25 19:43:05 UTC

svn commit: r778482 - in /incubator/tashi/trunk: etc/TashiDefaults.cfg src/tashi/nodemanager/nodemanager.py

Author: mryan3
Date: Mon May 25 19:43:05 2009
New Revision: 778482

URL: http://svn.apache.org/viewvc?rev=778482&view=rev
Log:
Fixed casing and variable naming for consistency


Modified:
    incubator/tashi/trunk/etc/TashiDefaults.cfg
    incubator/tashi/trunk/src/tashi/nodemanager/nodemanager.py

Modified: incubator/tashi/trunk/etc/TashiDefaults.cfg
URL: http://svn.apache.org/viewvc/incubator/tashi/trunk/etc/TashiDefaults.cfg?rev=778482&r1=778481&r2=778482&view=diff
==============================================================================
--- incubator/tashi/trunk/etc/TashiDefaults.cfg (original)
+++ incubator/tashi/trunk/etc/TashiDefaults.cfg Mon May 25 19:43:05 2009
@@ -64,9 +64,10 @@
 
 # NodeManger portion
 [NodeManager]
-Dfs = tashi.dfs.Vfs
-VmControl = tashi.nodemanager.vmcontrol.Qemu
-Service = tashi.nodemanager.NodeManagerService
+dfs = tashi.dfs.Vfs
+vmm = tashi.nodemanager.vmcontrol.Qemu
+service = tashi.nodemanager.NodeManagerService
+publisher = tashi.messaging.GangliaPublisher
 
 [NodeManagerService]
 convertExceptions = True

Modified: incubator/tashi/trunk/src/tashi/nodemanager/nodemanager.py
URL: http://svn.apache.org/viewvc/incubator/tashi/trunk/src/tashi/nodemanager/nodemanager.py?rev=778482&r1=778481&r2=778482&view=diff
==============================================================================
--- incubator/tashi/trunk/src/tashi/nodemanager/nodemanager.py (original)
+++ incubator/tashi/trunk/src/tashi/nodemanager/nodemanager.py Mon May 25 19:43:05 2009
@@ -40,9 +40,9 @@
 	logging.config.fileConfig(configFiles)
 	log = logging.getLogger(__name__)
 	log.info('Using configuration file(s) %s' % configFiles)
-	dfs = instantiateImplementation(config.get("NodeManager", "Dfs"), config)
-	vmm = instantiateImplementation(config.get("NodeManager", "VmControl"), config, dfs, None)
-	service = instantiateImplementation(config.get("NodeManager", "Service"), config, vmm)
+	dfs = instantiateImplementation(config.get("NodeManager", "dfs"), config)
+	vmm = instantiateImplementation(config.get("NodeManager", "vmm"), config, dfs, None)
+	service = instantiateImplementation(config.get("NodeManager", "service"), config, vmm)
 	vmm.nm = service
 	processor = nodemanagerservice.Processor(service)
 	transport = TServerSocket(int(config.get('NodeManagerService', 'port')))