X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=getconf.py;h=1008c74ffcbfc255f9571d0844cf81a2ac8d942a;hb=refs%2Fheads%2F1.0;hp=31e035c9965d58f782a6ca53c1b0d488f3b8accd;hpb=d0652340b89d51c6115edb13d5c7c72b34dea66f;p=monitor.git

diff --git a/getconf.py b/getconf.py
index 31e035c..1008c74 100755
--- a/getconf.py
+++ b/getconf.py
@@ -1,53 +1,52 @@
 #!/usr/bin/python
 
-import auth
 import plc
+api = plc.getAuthAPI()
 import sys
 import os
+import config
 
 def getconf(hostname, force=False, media=None):
-	api = plc.PLC(auth.auth, auth.plc)
 	n = api.GetNodes(hostname)
-	filename = "bootcd-alpha/" + hostname + ".txt"
+	filename = "bootcd/" + hostname + ".txt"
 	if not os.path.exists(filename) or force:
-		f = open("bootcd-alpha/" + hostname + ".txt", 'w')
+		f = open("bootcd/" + hostname + ".txt", 'w')
 		f.write( api.AdmGenerateNodeConfFile(n[0]['node_id']) )
 		f.close()
-		print os.system("cd bootcd-alpha; ./build.sh -f %s.txt -t iso -o /plc/data/var/www/html/bootcds/%s.iso &> /dev/null" % ( hostname, hostname))
-		print os.system("cd bootcd-alpha; ./build.sh -f %s.txt -t usb_partition -o /plc/data/var/www/html/bootcds/%s-partition.usb &> /dev/null" % ( hostname, hostname))
+		print os.system("cd bootcd; ./build.sh -f %s.txt -t iso -o /plc/data/var/www/html/bootcds/%s.iso &> /dev/null" % ( hostname, hostname))
+		print os.system("cd bootcd; ./build.sh -f %s.txt -t usb_partition -o /plc/data/var/www/html/bootcds/%s-partition.usb &> /dev/null" % ( hostname, hostname))
 	else:
 		# assume that the images have already been generated..
 		pass
 
 	args = {}
 	if not media:
-		args['url_list']  = "   http://monitor.planet-lab.org/bootcds/%s-partition.usb\n" % hostname
-		args['url_list'] += "   http://monitor.planet-lab.org/bootcds/%s.iso" % hostname
+		args['url_list']  = "   http://%s/bootcds/%s-partition.usb\n" % (config.MONITOR_HOSTNAME, hostname)
+		args['url_list'] += "   http://%s/bootcds/%s.iso" % (config.MONITOR_HOSTNAME, hostname)
 	else:
 		if media == "usb":
-			args['url_list']  = "   http://monitor.planet-lab.org/bootcds/%s-partition.usb\n" % hostname
+			args['url_list']  = "   http://%s/bootcds/%s-partition.usb\n" % (config.MONITOR_HOSTNAME, hostname)
 		elif media == "iso":
-			args['url_list']  = "   http://monitor.planet-lab.org/bootcds/%s.iso" % hostname
+			args['url_list']  = "   http://%s/bootcds/%s.iso" % (config.MONITOR_HOSTNAME, hostname)
 		else:
-			args['url_list']  = "   http://monitor.planet-lab.org/bootcds/%s-partition.usb\n" % hostname
-			args['url_list'] += "   http://monitor.planet-lab.org/bootcds/%s.iso" % hostname
+			args['url_list']  = "   http://%s/bootcds/%s-partition.usb\n" % (config.MONITOR_HOSTNAME, hostname)
+			args['url_list'] += "   http://%s/bootcds/%s.iso" % (config.MONITOR_HOSTNAME, hostname)
 			
-	#print "http://monitor.planet-lab.org/bootcds/%s.usb\n" % hostname
 
 	return args
 
 if __name__ == '__main__':
-	from config import config as cfg
-	from optparse import OptionParser
-	parser = OptionParser()
+	import parser as parsermodule
+
+	parser = parsermodule.getParser()
 	parser.set_defaults(media='both', force=False)
 	parser.add_option("", "--media", dest="media", metavar="usb, iso, both", 
 						help="""Which media to generate the message for.""")
 	parser.add_option("", "--force", dest="force", action="store_true", 
 						help="""Force the recreation of the usb images.""")
+	parser = parsermodule.getParser(['defaults'], parser)
 
-	config = cfg(parser)
-	config.parse_args()
+	config = parsermodule.parse_args(parser)
 
 	ret = {'url_list' : ''} 
 	for i in config.args: