X-Git-Url: http://git.onelab.eu/?p=nodemanager.git;a=blobdiff_plain;f=conf_files.py;h=72a0e0013bbe882e6c7530ed0cba55af3897ca84;hp=f002262583fa0f7e2eea3fbf1056dfe7df1146c1;hb=HEAD;hpb=092c03bb5bf7bbafb279d9a4685121ca54e80e5f diff --git a/conf_files.py b/conf_files.py old mode 100644 new mode 100755 index f002262..72a0e00 --- a/conf_files.py +++ b/conf_files.py @@ -1,113 +1,172 @@ -"""configuration files""" +#!/usr/bin/env python3 + +# pylint: disable=c0111 + +""" +update local configuration files from PLC +""" -import grp import os +import time import pwd -import sha -import string -import threading +import grp +from hashlib import sha1 as sha +import xmlrpc.client import curlwrapper import logger import tools +from config import Config +# right after net +priority = 2 -class conf_files: - def __init__(self, config): - self.config = config - self.cond = threading.Condition() +class ConfFiles: + def __init__(self, noscripts=False): + self.config = Config() + self.noscripts = noscripts 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 cmd: - logger.log('conf_files: running command %s' % cmd) - return os.system(cmd) + if not self.noscripts and 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 + 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) - uid = pwd.getpwnam(cf_rec['file_owner'])[2] - gid = grp.getgrnam(cf_rec['file_group'])[2] + 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)) + 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) - if not cf_rec['always_update'] and sha.new(contents).digest() == self.checksum(dest): + # 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 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(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 + 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), mode=mode, uidgid=(uid,gid)) - if self.system(cf_rec['postinstall_cmd']): self.system(err_cmd) + 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 d in data: - for f in d['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 "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') -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)') - (options, args) = parser.parse_args() + +def start(): + pass + + +def GetSlivers(data, config=None, plc=None): + logger.log("conf_files: Running.") + instance = ConfFiles() + instance.run_once(data) + logger.log("conf_files: Done.") + + +def main(): + from argparse import ArgumentParser + from plcapi import PLCAPI + + 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') + parser.add_argument('--max-attempts', action='store', dest='max_attempts', + default=10, + help='Max number of attempts') + parser.add_argument('--period', action='store', dest='period', + help='Time in seconds to wait between attempts') + 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 + + # loop until it succeeds once + # this is a change that comes with python3/fedora29 in late 2018, + # because although the conf_files service is defined to systemd + # as a dependency of the network, it triggers too early + # at a point where eth0 is not ready # Initialize XML-RPC client - from plcapi import PLCAPI - plc = PLCAPI(config.plc_api_uri, config.cacert, auth = session) + attempts = 0 + while True: + try: + plc = PLCAPI(config.plc_api_uri, config.cacert, auth=session) + data = plc.GetSlivers() + instance = ConfFiles(args.noscripts) + instance.run_once(data) + return 0 + except Exception as exc: + logger.log_exc("Could not receive GetSlivers() from PLC") + attempts += 1 + if attempts >= args.max_attempts: + return 1 + logger.log("Waiting for {}s before trying again".format(args.period)) + time.sleep(args.period) + - main = conf_files(config) - data = plc.GetSlivers() - main.run_once(data) +if __name__ == '__main__': + main()