incubator-tashi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From strou...@apache.org
Subject svn commit: r960735 - in /incubator/tashi/trunk: etc/ src/tashi/ src/tashi/agents/ src/tashi/aws/ src/tashi/client/ src/tashi/messaging/ src/tashi/nodemanager/vmcontrol/
Date Tue, 06 Jul 2010 00:30:49 GMT
Author: stroucki
Date: Tue Jul  6 00:30:49 2010
New Revision: 960735

URL: http://svn.apache.org/viewvc?rev=960735&view=rev
Log:
sync back to master

Modified:
    incubator/tashi/trunk/etc/NodeManager.cfg
    incubator/tashi/trunk/etc/TashiDefaults.cfg
    incubator/tashi/trunk/src/tashi/agents/dhcpdns.py
    incubator/tashi/trunk/src/tashi/aws/soap.py
    incubator/tashi/trunk/src/tashi/client/client.py
    incubator/tashi/trunk/src/tashi/client/tashi-client.py
    incubator/tashi/trunk/src/tashi/messaging/gangliapublisher.py
    incubator/tashi/trunk/src/tashi/nodemanager/vmcontrol/qemu.py
    incubator/tashi/trunk/src/tashi/nodemanager/vmcontrol/xenpv.py
    incubator/tashi/trunk/src/tashi/util.py

Modified: incubator/tashi/trunk/etc/NodeManager.cfg
URL: http://svn.apache.org/viewvc/incubator/tashi/trunk/etc/NodeManager.cfg?rev=960735&r1=960734&r2=960735&view=diff
==============================================================================
--- incubator/tashi/trunk/etc/NodeManager.cfg (original)
+++ incubator/tashi/trunk/etc/NodeManager.cfg Tue Jul  6 00:30:49 2010
@@ -57,7 +57,6 @@ convertExceptions = True
 port = 9883
 registerFrequency = 10.0
 infoFile = /var/tmp/nm.dat
-
 clusterManagerHost = localhost ; Clustermanager hostname
 clusterManagerPort = 9882
 statsInterval = 0.0

Modified: incubator/tashi/trunk/etc/TashiDefaults.cfg
URL: http://svn.apache.org/viewvc/incubator/tashi/trunk/etc/TashiDefaults.cfg?rev=960735&r1=960734&r2=960735&view=diff
==============================================================================
--- incubator/tashi/trunk/etc/TashiDefaults.cfg (original)
+++ incubator/tashi/trunk/etc/TashiDefaults.cfg Tue Jul  6 00:30:49 2010
@@ -20,21 +20,21 @@ authAndEncrypt = False
 
 [AccessClusterManager]
 #If username and password are left empty, user will be prompted for username and password
on the command line.
-username = nodemanager
-password = nodemanager
+username = clustermanagerusername
+password = clustermanagerpassword
 
 [AccessNodeManager]
 #If username and password are left empty, user will be prompted for username and password
on the command line.
-username = clustermanager
-password = clustermanager
+username = nodemanagerusername
+password = nodemanagerpassword
 
 [AllowedUsers]
-nodeManagerUser = nodemanager
-nodeManagerPassword = nodemanager
+nodeManagerUser = nodemanagerusername
+nodeManagerPassword = nodemanagerpassword
 agentUser = agent
 agentPassword = agent
-clusterManagerUser = clustermanager
-clusterManagerPassword = clustermanager
+clusterManagerUser = clustermanagerusername
+clusterManagerPassword = clustermanagerpassword
 
 # ClusterManager portion
 [ClusterManager]
@@ -99,7 +99,6 @@ convertExceptions = True
 port = 9883
 registerFrequency = 10.0
 infoFile = /var/tmp/nm.dat
-
 clusterManagerHost = localhost ;  Clustermanger hostname
 clusterManagerPort = 9882
 statsInterval = 0.0
@@ -119,16 +118,17 @@ statsInterval = 0.0
 [XenPV]
 vmNamePrefix = tashi
 transientdir = /tmp
-defaultVmType = kernel
-defaultKernel = /boot/vmlinuz-xen
-defaultRamdisk = /boot/initrd-xen
+defaultVmType = pygrub
+#defaultVmType = kernel
+#defaultKernel = /boot/vmlinuz-xen
+#defaultRamdisk = /boot/initrd-xen
 defaultDiskType=qcow
 
 [Vfs]
 prefix = /dfs
 
 [LocalityService]
-host = localityserver
+host = localityserverhostname
 port = 9884
 staticLayout = /location/of/layout/file
 

Modified: incubator/tashi/trunk/src/tashi/agents/dhcpdns.py
URL: http://svn.apache.org/viewvc/incubator/tashi/trunk/src/tashi/agents/dhcpdns.py?rev=960735&r1=960734&r2=960735&view=diff
==============================================================================
--- incubator/tashi/trunk/src/tashi/agents/dhcpdns.py (original)
+++ incubator/tashi/trunk/src/tashi/agents/dhcpdns.py Tue Jul  6 00:30:49 2010
@@ -113,6 +113,7 @@ class DhcpDns(InstanceHook):
 		except:
 			pass
 		cmd = "omshell"
+# XXXpipe: open omshell session
 		(stdin, stdout) = os.popen2(cmd)
 		stdin.write("server %s\n" % (self.dhcpServer))
 		if (self.dhcpSecretKey != ""):
@@ -130,6 +131,7 @@ class DhcpDns(InstanceHook):
 
 	def removeDhcp(self, name, ipaddr=None):
 		cmd = "omshell"
+# XXXpipe: open omshell session
 		(stdin, stdout) = os.popen2(cmd)
 		stdin.write("server %s\n" % (self.dhcpServer))
 		if (self.dhcpSecretKey != ""):

Modified: incubator/tashi/trunk/src/tashi/aws/soap.py
URL: http://svn.apache.org/viewvc/incubator/tashi/trunk/src/tashi/aws/soap.py?rev=960735&r1=960734&r2=960735&view=diff
==============================================================================
--- incubator/tashi/trunk/src/tashi/aws/soap.py (original)
+++ incubator/tashi/trunk/src/tashi/aws/soap.py Tue Jul  6 00:30:49 2010
@@ -64,6 +64,7 @@ class ValidateParsedSoap(ParsedSoap):
 		f2 = open(ofile, "w")
 		f2.write(output)
 		f2.close()
+# XXXpipe: what are we doing here?
 		(stdin, stdout) = os.popen4("xmlsec1 --verify --id-attr:Id Timestamp --id-attr:Id Body
--pubkey-cert-pem /var/lib/tashi-ec2/%s.crt --print-debug %s" % (CERT_DIGEST, ofile))
 		stdin.close()
 		res = stdout.read()

Modified: incubator/tashi/trunk/src/tashi/client/client.py
URL: http://svn.apache.org/viewvc/incubator/tashi/trunk/src/tashi/client/client.py?rev=960735&r1=960734&r2=960735&view=diff
==============================================================================
--- incubator/tashi/trunk/src/tashi/client/client.py (original)
+++ incubator/tashi/trunk/src/tashi/client/client.py Tue Jul  6 00:30:49 2010
@@ -33,6 +33,8 @@ from tashi.util import getConfig
 
 def makeHTMLTable(list):
 	(stdin_r, stdin_w) = os.pipe()
+
+# XXXpipe: find number of columns in current window
 	pipe = os.popen("tput cols")
 	columns = pipe.read().strip()
 	keys = {}

Modified: incubator/tashi/trunk/src/tashi/client/tashi-client.py
URL: http://svn.apache.org/viewvc/incubator/tashi/trunk/src/tashi/client/tashi-client.py?rev=960735&r1=960734&r2=960735&view=diff
==============================================================================
--- incubator/tashi/trunk/src/tashi/client/tashi-client.py (original)
+++ incubator/tashi/trunk/src/tashi/client/tashi-client.py Tue Jul  6 00:30:49 2010
@@ -349,6 +349,7 @@ def genKeys(list):
 def makeTable(list, keys=None):
 	(consoleWidth, consoleHeight) = (9999, 9999)
 	try:
+# XXXpipe: get number of rows and column on current window
 		stdout = os.popen("stty size")
 		r = stdout.read()
 		stdout.close()

Modified: incubator/tashi/trunk/src/tashi/messaging/gangliapublisher.py
URL: http://svn.apache.org/viewvc/incubator/tashi/trunk/src/tashi/messaging/gangliapublisher.py?rev=960735&r1=960734&r2=960735&view=diff
==============================================================================
--- incubator/tashi/trunk/src/tashi/messaging/gangliapublisher.py (original)
+++ incubator/tashi/trunk/src/tashi/messaging/gangliapublisher.py Tue Jul  6 00:30:49 2010
@@ -50,6 +50,7 @@ class GangliaPublisher(object):
 			except:
 				pass
 			cmd = 'gmetric -n "%s" -v "%s" -t "%s" -d "%d"' % (metricName, metricValue, metricType,
self.dmax)
+# XXXpipe: send a datum to ganglia
 			(stdin, stdout) = os.popen4(cmd)
 			stdin.close()
 			res = stdout.read()

Modified: incubator/tashi/trunk/src/tashi/nodemanager/vmcontrol/qemu.py
URL: http://svn.apache.org/viewvc/incubator/tashi/trunk/src/tashi/nodemanager/vmcontrol/qemu.py?rev=960735&r1=960734&r2=960735&view=diff
==============================================================================
--- incubator/tashi/trunk/src/tashi/nodemanager/vmcontrol/qemu.py (original)
+++ incubator/tashi/trunk/src/tashi/nodemanager/vmcontrol/qemu.py Tue Jul  6 00:30:49 2010
@@ -467,6 +467,7 @@ class Qemu(VmControlInterface):
 		# XXX: Cleanly wait until the port is open
 		lc = 0
 		while (lc < 1):
+# XXXpipe: find whether something is listening yet on the port
 			(stdin, stdout) = os.popen2("netstat -ln | grep 0.0.0.0:%d | wc -l" % (port))
 			stdin.close()
 			r = stdout.read()

Modified: incubator/tashi/trunk/src/tashi/nodemanager/vmcontrol/xenpv.py
URL: http://svn.apache.org/viewvc/incubator/tashi/trunk/src/tashi/nodemanager/vmcontrol/xenpv.py?rev=960735&r1=960734&r2=960735&view=diff
==============================================================================
--- incubator/tashi/trunk/src/tashi/nodemanager/vmcontrol/xenpv.py (original)
+++ incubator/tashi/trunk/src/tashi/nodemanager/vmcontrol/xenpv.py Tue Jul  6 00:30:49 2010
@@ -37,12 +37,14 @@ log = logging.getLogger(__file__)
 
 # FIXME: these should throw errors on failure
 def domIdToName(domid):
+# XXXpipe: get domain name from id
 	f = os.popen("xm domname %i"%domid)
 	name = f.readline().strip()
 	f.close()
 	return name
 
 def domNameToId(domname):
+# XXXpipe: get domain id from name
 	f = os.popen("xm domid %s"%domname)
 	name = f.readline().strip()
 	f.close()

Modified: incubator/tashi/trunk/src/tashi/util.py
URL: http://svn.apache.org/viewvc/incubator/tashi/trunk/src/tashi/util.py?rev=960735&r1=960734&r2=960735&view=diff
==============================================================================
--- incubator/tashi/trunk/src/tashi/util.py (original)
+++ incubator/tashi/trunk/src/tashi/util.py Tue Jul  6 00:30:49 2010
@@ -226,6 +226,7 @@ def debugConsole(globalDict):
 			import atexit
 			from IPython.Shell import IPShellEmbed
 			def resetConsole():
+# XXXpipe: make input window sane
 				(stdin, stdout) = os.popen2("reset")
 				stdout.read()
 			dbgshell = IPShellEmbed()



Mime
View raw message