cross-module change for 4.2

[nodemanager.git] / conf_files.py

diff --git a/conf_files.py b/conf_files.py
index d349de0..64e18c2 100644 (file)
--- a/conf_files.py
+++ b/conf_files.py
@@ -10,14 +10,26 @@ import threading
 import curlwrapper
 import logger
 import tools
-
+import xmlrpclib
 
 class conf_files:
-    def __init__(self, config):
+    def __init__(self, config, noscripts=False):
         self.config = config
+        self.noscripts = noscripts
         self.cond = threading.Condition()
         self.data = None
 
+    # get node_id from /etc/planetlab/node_id and cache it
+    _node_id=None
+    @staticmethod 
+    def node_id():
+        if conf_files._node_id is None:
+            try:
+                conf_files._node_id=int(file("/etc/planetlab/node_id").read())
+            except:
+                conf_files._node_id=""
+        return conf_files._node_id
+
     def checksum(self, path):
         try:
             f = open(path)
@@ -26,9 +38,9 @@ class conf_files:
         except IOError: return None
 
     def system(self, cmd):
-        if cmd:
+        if not self.noscripts and cmd:
             logger.log('conf_files: running command %s' % cmd)
-            return os.system(cmd)
+            return tools.fork_as(None, os.system, cmd)
         else: return 0
 
     def update_conf_file(self, cf_rec):
@@ -38,10 +50,28 @@ class conf_files:
         if dest == '/etc/proper/propd.conf': return
         err_cmd = cf_rec['error_cmd']
         mode = string.atoi(cf_rec['file_permissions'], base=8)
-        uid = pwd.getpwnam(cf_rec['file_owner'])[2]
-        gid = grp.getgrnam(cf_rec['file_group'])[2]
+        try:
+            uid = pwd.getpwnam(cf_rec['file_owner'])[2]
+        except:
+            logger.log('conf_files: cannot find user %s -- %s not updated'%(cf_rec['file_owner'],dest))
+            return
+        try:
+            gid = grp.getgrnam(cf_rec['file_group'])[2]
+        except:
+            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'])
-        contents = curlwrapper.retrieve(url, self.config.cacert)
+        # set node_id at the end of the request - hacky
+        if conf_files.node_id():
+            if url.find('?') >0: url += '&'
+            else:                url += '?'
+            url += "node_id=%d"%conf_files.node_id()
+        try:
+            logger.log("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))
+            return
         if not cf_rec['always_update'] and sha.new(contents).digest() == self.checksum(dest):
             return
         if self.system(cf_rec['preinstall_cmd']):
@@ -91,6 +121,7 @@ if __name__ == '__main__':
     parser = optparse.OptionParser()
     parser.add_option('-f', '--config', action='store', dest='config', default='/etc/planetlab/plc_config', help='PLC configuration file')
     parser.add_option('-k', '--session', action='store', dest='session', default='/etc/planetlab/session', help='API session key (or file)')
+    parser.add_option('--noscripts', action='store_true', dest='noscripts', default=False, help='Do not run pre- or post-install scripts')
     (options, args) = parser.parse_args()
 
     # Load /etc/planetlab/plc_config
@@ -107,6 +138,6 @@ if __name__ == '__main__':
     from plcapi import PLCAPI
     plc = PLCAPI(config.plc_api_uri, config.cacert, auth = session)
 
-    main = conf_files(config)
+    main = conf_files(config, options.noscripts)
     data = plc.GetSlivers()
     main.run_once(data)