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
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):
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]
url = 'https://%s/%s' % (self.config.PLC_BOOT_HOST, cf_rec['source'])
- contents = curlwrapper.retrieve(url, self.config.cacert)
+ try:
+ contents = curlwrapper.retrieve(url, self.config.cacert)
+ except curlwrapper.CurlException:
+ 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']):
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()
+ for f in data['conf_files']:
+ try: self.update_conf_file(f)
+ except: logger.log_exc()
def run(self):
while True:
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
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)