X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=conf_files.py;h=b13836f31082cf72abc6bdb7b4fd993f2c4f252a;hb=5c978286e27531da994fe12d1090d7af9e7b03fd;hp=ef4b1f001c5a12d5484a668e418e15056f66196c;hpb=1aaef5376e2e31f6bf47c5b4c2a75e69a6d5f81f;p=nodemanager.git diff --git a/conf_files.py b/conf_files.py old mode 100644 new mode 100755 index ef4b1f0..b13836f --- a/conf_files.py +++ b/conf_files.py @@ -1,30 +1,37 @@ -"""configuration files""" +#!/usr/bin/env python3 + +# pylint: disable=c0111 + +""" +update local configuration files from PLC +""" import grp import os import pwd -import sha -import string -import threading +from hashlib import sha1 as sha +import xmlrpc.client import curlwrapper import logger import tools -import xmlrpclib +from config import Config + +# right after net +priority = 2 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): try: - f = open(path) - try: return sha.new(f.read()).digest() - finally: f.close() - except IOError: return None + with open(path) as feed: + return sha(feed.read().encode()).digest() + except IOError: + return None def system(self, cmd): if not self.noscripts and cmd: @@ -33,92 +40,110 @@ class conf_files: else: return 0 def update_conf_file(self, cf_rec): - if not cf_rec['enabled']: return + if not cf_rec['enabled']: + return dest = cf_rec['dest'] err_cmd = cf_rec['error_cmd'] - mode = string.atoi(cf_rec['file_permissions'], base=8) + mode = int(cf_rec['file_permissions'], base=8) 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)) + 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)) + 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('conf_files: %s -- WARNING, cannot add node_id to request' + % dest) try: + logger.verbose("conf_files: retrieving URL=%s"%url) contents = curlwrapper.retrieve(url, self.config.cacert) - except xmlrpclib.ProtocolError,e: + except xmlrpc.client.ProtocolError as 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): + if not cf_rec['always_update'] and sha(contents).digest() == self.checksum(dest): return if self.system(cf_rec['preinstall_cmd']): self.system(err_cmd) - if not cf_rec['ignore_cmd_errors']: return - logger.verbose('conf_files: installing file %s from %s' % (dest, url)) - try: os.makedirs(os.path.dirname(dest)) - except OSError: pass - tools.write_file(dest, lambda f: f.write(contents), mode=mode, uidgid=(uid,gid)) - if self.system(cf_rec['postinstall_cmd']): self.system(err_cmd) + if not cf_rec['ignore_cmd_errors']: + return + logger.log('conf_files: installing file %s from %s' % (dest, url)) + try: + os.makedirs(os.path.dirname(dest)) + except OSError: + pass + tools.write_file(dest, lambda f: f.write(contents.decode()), + mode=mode, uidgid=(uid, gid)) + 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() - -main = None - -def start(options, config): - global main - main = conf_files(config) - tools.as_daemon_thread(main.run) - -def GetSlivers(data): - global main - assert main is not None - return main.callback(data) - -if __name__ == '__main__': - import optparse - 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() + if "conf_files" in data: + for file in data['conf_files']: + try: + self.update_conf_file(file) + except: + logger.log_exc("conf_files: failed to update conf_file") + else: + logger.log_missing_data("conf_files.run_once", 'conf_files') + + +def start(): + pass + + +def GetSlivers(data, config=None, plc=None): + logger.log("conf_files: Running.") + instance = conf_files() + instance.run_once(data) + logger.log("conf_files: Done.") + + +def main(): + from argparse import ArgumentParser + parser = ArgumentParser() + parser.add_argument('-f', '--config', action='store', dest='config', + default='/etc/planetlab/plc_config', + help='PLC configuration file') + parser.add_argument('-k', '--session', action='store', dest='session', + default='/etc/planetlab/session', + help='API session key (or file)') + parser.add_argument('--noscripts', action='store_true', dest='noscripts', + default=False, + help='Do not run pre- or post-install scripts') + args = parser.parse_args() # Load /etc/planetlab/plc_config - from config import Config - config = Config(options.config) + config = Config(args.config) # Load /etc/planetlab/session - if os.path.exists(options.session): - session = file(options.session).read().strip() + if os.path.exists(args.session): + with open(args.session) as feed: + session = feed.read().strip() else: - session = options.session + session = args.session # Initialize XML-RPC client from plcapi import PLCAPI - plc = PLCAPI(config.plc_api_uri, config.cacert, auth = session) - - main = conf_files(config, options.noscripts) + plc = PLCAPI(config.plc_api_uri, config.cacert, auth=session) data = plc.GetSlivers() - main.run_once(data) + + instance = conf_files(args.noscripts) + instance.run_once(data) + + +if __name__ == '__main__': + main()