fixed and moved the server-side yum scripts, from nodeconfig/yum to BootstrapFS/nodec...

[nodemanager.git] / conf_files.py

diff --git a/conf_files.py b/conf_files.py
index fc90da2..1e5d960 100644 (file)
--- a/conf_files.py
+++ b/conf_files.py
@@ -1,3 +1,6 @@
+# $Id$
+# $URL$
+
 """configuration files"""
 
 import grp
@@ -54,11 +57,6 @@ class conf_files:
             url += "node_id=%d"%tools.node_id()
         else:
             logger.log('%s -- WARNING, cannot add node_id to request'%dest)
-        # pass slicefamily as well, as stored in /etc/planetlab/slicefamily ont the node
-        if tools.slicefamily():
-            if url.find('?') >0: url += '&'
-            else:                url += '?'
-            url += "slicefamily=%s"%tools.slicefamily()
         try:
             logger.verbose("retrieving URL=%s"%url)
             contents = curlwrapper.retrieve(url, self.config.cacert)
@@ -86,7 +84,7 @@ class conf_files:
 
 def start(options, config): pass
 
-def GetSlivers(data, plc = None, config = None):
+def GetSlivers(data, config = None, plc = None):
     logger.log("conf_files: Running.")
     cf = conf_files()
     cf.run_once(data)