From: Stephen Soltesz <soltesz@cs.princeton.edu>
Date: Fri, 15 Aug 2008 21:07:45 +0000 (+0000)
Subject: use config module rather than monitorconfig.py
X-Git-Tag: Monitor-1.0-7~6
X-Git-Url: http://git.onelab.eu/?p=monitor.git;a=commitdiff_plain;h=5b7ebb918bb8c5c26c34219bf1d32e7c44505110

use config module rather than monitorconfig.py
---

diff --git a/plc.py b/plc.py
index 363bc8c..783efbc 100644
--- a/plc.py
+++ b/plc.py
@@ -30,11 +30,11 @@ XMLRPC_SERVER="https://boot.planet-lab.org/PLCAPI/"
 #       configured, use them, with their auth definitions.
 auth = Auth()
 try:
-	import monitorconfig
-	auth.auth = {'Username' : monitorconfig.API_AUTH_USER,
+	from monitor import config
+	auth.auth = {'Username' : config.API_AUTH_USER,
 	             'AuthMethod' : 'password',
-				 'AuthString' : monitorconfig.API_AUTH_PASSWORD}
-	auth.server = monitorconfig.API_SERVER
+				 'AuthString' : config.API_AUTH_PASSWORD}
+	auth.server = config.API_SERVER
 except:
 	try:
 		import auth