X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=source%2FBootManager.py;h=4ea06c8c44cff4765561e5b9259c4b4013826293;hb=af4c13ea318458fc62645973f069657e7b5e5e20;hp=370044fb4279a0dcba44fc6330e3536b4d47f39b;hpb=fedd02d122a4e365b3c02059b55440b6c1a27f03;p=bootmanager.git diff --git a/source/BootManager.py b/source/BootManager.py index 370044f..4ea06c8 100755 --- a/source/BootManager.py +++ b/source/BootManager.py @@ -1,5 +1,8 @@ #!/usr/bin/python -u - +# +# $Id$ +# $URL$ +# # Copyright (c) 2003 Intel Corporation # All rights reserved. # @@ -15,10 +18,11 @@ from steps import * from Exceptions import * import notify_messages import BootServerRequest +import utils # all output is written to this file BM_NODE_LOG= "/tmp/bm.log" -UPLOAD_LOG_SCRIPT = "/boot/upload-bmlog.php" +VARS_FILE = "configuration" # the new contents of PATH when the boot manager is running BIN_PATH= ('/usr/local/bin', @@ -27,7 +31,43 @@ BIN_PATH= ('/usr/local/bin', '/usr/sbin', '/bin', '/sbin') - + +def read_configuration_file(filename): + # read in and store all variables in VARS_FILE into each line + # is in the format name=val (any whitespace around the = is + # removed. everything after the = to the end of the line is + # the value + vars = {} + vars_file= file(filename,'r') + validConfFile = True + for line in vars_file: + # if its a comment or a whitespace line, ignore + if line[:1] == "#" or string.strip(line) == "": + continue + + parts= string.split(line,"=") + if len(parts) != 2: + validConfFile = False + raise Exception( "Invalid line in vars file: %s" % line ) + + name= string.strip(parts[0]) + value= string.strip(parts[1]) + value= value.replace("'", "") # remove quotes + value= value.replace('"', "") # remove quotes + vars[name]= value + + vars_file.close() + if not validConfFile: + raise Exception( "Unable to read configuration vars." ) + + # find out which directory we are running it, and set a variable + # for that. future steps may need to get files out of the bootmanager + # directory + current_dir= os.getcwd() + vars['BM_SOURCE_DIR']= current_dir + + return vars + ############################## class log: @@ -40,6 +80,14 @@ class log: except: print( "bootmanager log : Unable to open output file %r, continuing"%OutputFilePath ) self.OutputFile= None + + self.VARS = None + try: + vars = read_configuration_file(VARS_FILE) + self.VARS = vars + except Exception, e: + self.LogEntry( str(e) ) + return def LogEntry( self, str, inc_newline= 1, display_screen= 1 ): now=time.strftime(log.format, time.localtime()) @@ -65,29 +113,48 @@ class log: self.LogEntry( str, 0, 1 ) # bm log uploading is available back again, as of nodeconfig-5.0-2 - def Upload( self ): + def Upload( self, extra_file=None ): """ upload the contents of the log to the server """ if self.OutputFile is not None: self.OutputFile.flush() - self.LogEntry( "Uploading logs to %s" % UPLOAD_LOG_SCRIPT ) + self.LogEntry( "Uploading logs to %s" % self.VARS['UPLOAD_LOG_SCRIPT'] ) self.OutputFile.close() self.OutputFile= None - bs_request = BootServerRequest.BootServerRequest() - bs_request.MakeRequest(PartialPath = UPLOAD_LOG_SCRIPT, - GetVars = None, PostVars = None, - FormData = ["log=@" + self.OutputFilePath], - DoSSL = True, DoCertCheck = True) + hostname= self.VARS['INTERFACE_SETTINGS']['hostname'] + "." + \ + self.VARS['INTERFACE_SETTINGS']['domainname'] + bs_request = BootServerRequest.BootServerRequest(self.VARS) + try: + # this was working until f10 + bs_request.MakeRequest(PartialPath = self.VARS['UPLOAD_LOG_SCRIPT'], + GetVars = None, PostVars = None, + DoSSL = True, DoCertCheck = True, + FormData = ["log=@" + self.OutputFilePath, + "hostname=" + hostname, + "type=bm.log"]) + except: + # new pycurl + import pycurl + bs_request.MakeRequest(PartialPath = self.VARS['UPLOAD_LOG_SCRIPT'], + GetVars = None, PostVars = None, + DoSSL = True, DoCertCheck = True, + FormData = [('log',(pycurl.FORM_FILE, self.OutputFilePath)), + ("hostname",hostname), + ("type","bm.log")]) + if extra_file is not None: + # NOTE: for code-reuse, evoke the bash function 'upload_logs'; + # by adding --login, bash reads .bash_profile before execution. + utils.sysexec( """bash --login -c "upload_logs %s" """ % extra_file, self) + ############################## class BootManager: # file containing initial variables/constants - VARS_FILE = "configuration" # the set of valid node run states NodeRunStates = {'reinstall':None, @@ -105,46 +172,16 @@ class BootManager: # set to 1 if we can run after initialization self.CAN_RUN = 0 - - # read in and store all variables in VARS_FILE into each line - # is in the format name=val (any whitespace around the = is - # removed. everything after the = to the end of the line is - # the value - vars = {} - vars_file= file(self.VARS_FILE,'r') - validConfFile = True - for line in vars_file: - # if its a comment or a whitespace line, ignore - if line[:1] == "#" or string.strip(line) == "": - continue - - parts= string.split(line,"=") - if len(parts) != 2: - self.LOG.LogEntry( "Invalid line in vars file: %s" % line ) - validConfFile = False - break - - name= string.strip(parts[0]) - value= string.strip(parts[1]) - vars[name]= value - - vars_file.close() - if not validConfFile: - self.LOG.LogEntry( "Unable to read configuration vars." ) - return - - # find out which directory we are running it, and set a variable - # for that. future steps may need to get files out of the bootmanager - # directory - current_dir= os.getcwd() - vars['BM_SOURCE_DIR']= current_dir + if log.VARS: + # this contains a set of information used and updated by each step + self.VARS= log.VARS + else: + return + # not sure what the current PATH is set to, replace it with what # we know will work with all the boot cds os.environ['PATH']= string.join(BIN_PATH,":") - - # this contains a set of information used and updated by each step - self.VARS= vars self.CAN_RUN= 1 @@ -195,7 +232,6 @@ class BootManager: ret = ValidateNodeInstall.Run( self.VARS, self.LOG ) if ret == 1: WriteModprobeConfig.Run( self.VARS, self.LOG ) - MakeInitrd.Run( self.VARS, self.LOG ) WriteNetworkConfig.Run( self.VARS, self.LOG ) CheckForNewDisks.Run( self.VARS, self.LOG ) SendHardwareConfigToPLC.Run( self.VARS, self.LOG ) @@ -331,6 +367,9 @@ def main(argv): # the data back to PlanetLab central LOG= log( BM_NODE_LOG ) + # NOTE: assume CWD is BM's source directory, but never fail + utils.sysexec("./setup_bash_history_scripts.sh || /bin/true", LOG) + LOG.LogEntry( "BootManager started at: %s" % \ time.strftime("%a, %d %b %Y %H:%M:%S +0000", time.gmtime()) )