X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=conf_files.py;h=b3b65f8c04c5b8470b4cb88fa5949a2ed6ff7758;hb=32ae26e1efd7609dc17c9695bb66334afbc44b76;hp=0ae0024d6f5d31b619ed631159a9918a0902cc2c;hpb=75eb060a541caa2fc9dabb82109e36e726128c1f;p=nodemanager.git

diff --git a/conf_files.py b/conf_files.py
index 0ae0024..b3b65f8 100644
--- a/conf_files.py
+++ b/conf_files.py
@@ -5,18 +5,17 @@ import os
 import pwd
 import sha
 import string
-import threading
 
 import curlwrapper
 import logger
 import tools
-
+import xmlrpclib
+from config import Config 
 
 class conf_files:
-    def __init__(self, config, noscripts=False):
-        self.config = config
+    def __init__(self, noscripts=False):
+        self.config = Config()
         self.noscripts = noscripts
-        self.cond = threading.Condition()
         self.data = None
 
     def checksum(self, path):
@@ -28,15 +27,13 @@ class conf_files:
 
     def system(self, cmd):
         if not self.noscripts and cmd:
-            logger.log('conf_files: running command %s' % cmd)
+            logger.verbose('conf_files: running command %s' % cmd)
             return tools.fork_as(None, os.system, cmd)
         else: return 0
 
     def update_conf_file(self, cf_rec):
         if not cf_rec['enabled']: return
         dest = cf_rec['dest']
-        # XXX Remove once old Node Manager is out of service
-        if dest == '/etc/proper/propd.conf': return
         err_cmd = cf_rec['error_cmd']
         mode = string.atoi(cf_rec['file_permissions'], base=8)
         try:
@@ -50,7 +47,20 @@ class conf_files:
             logger.log('conf_files: cannot find group %s -- %s not updated'%(cf_rec['file_group'],dest))
             return
         url = 'https://%s/%s' % (self.config.PLC_BOOT_HOST, cf_rec['source'])
+        # set node_id at the end of the request - hacky
+        if tools.node_id():
+            if url.find('?') >0: url += '&'
+            else:                url += '?'
+            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)
         except xmlrpclib.ProtocolError,e:
             logger.log('conf_files: failed to retrieve %s from %s, skipping' % (dest, url))
@@ -67,37 +77,20 @@ class conf_files:
         if self.system(cf_rec['postinstall_cmd']): self.system(err_cmd)
 
     def run_once(self, data):
-        for f in data['conf_files']:
-            try: self.update_conf_file(f)
-            except: logger.log_exc()
-
-    def run(self):
-        while True:
-            self.cond.acquire()
-            while self.data == None: self.cond.wait()
-            data = self.data
-            self.data = None
-            self.cond.release()
-            self.run_once(data)
-
-    def callback(self, data):
-        if data != None:
-            self.cond.acquire()
-            self.data = data
-            self.cond.notify()
-            self.cond.release()
+        if data.has_key("conf_files"):
+            for f in data['conf_files']:
+                try: self.update_conf_file(f)
+                except: logger.log_exc()
+        else: logger.log("conf_files:  No conf_files found or API failure.  Skipping")
 
-main = None
 
-def start(options, config):
-    global main
-    main = conf_files(config)
-    tools.as_daemon_thread(main.run)
+def start(options, config): pass
 
-def GetSlivers(data):
-    global main
-    assert main is not None
-    return main.callback(data)
+def GetSlivers(data, config = None, plc = None):
+    logger.log("conf_files: Running.")
+    cf = conf_files()
+    cf.run_once(data)
+    logger.log("conf_files: Done.")
 
 if __name__ == '__main__':
     import optparse
@@ -108,7 +101,6 @@ if __name__ == '__main__':
     (options, args) = parser.parse_args()
 
     # Load /etc/planetlab/plc_config
-    from config import Config
     config = Config(options.config)
 
     # Load /etc/planetlab/session
@@ -121,6 +113,6 @@ if __name__ == '__main__':
     from plcapi import PLCAPI
     plc = PLCAPI(config.plc_api_uri, config.cacert, auth = session)
 
-    main = conf_files(config, options.noscripts)
+    main = conf_files(options.noscripts)
     data = plc.GetSlivers()
     main.run_once(data)