X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=source%2Fsteps%2FInstallBootstrapFS.py;h=2c49acc5ad8c8cbc1daa5bcb520facbbb13310b1;hb=9807dbe301e4e078c07bff4df81ff33811a5cca7;hp=2a134207ebb371da5dc7b766cb987a666849c802;hpb=d44bfa0b0d284fc1b9e07d2593488ec7296efda8;p=bootmanager.git diff --git a/source/steps/InstallBootstrapFS.py b/source/steps/InstallBootstrapFS.py index 2a13420..2c49acc 100644 --- a/source/steps/InstallBootstrapFS.py +++ b/source/steps/InstallBootstrapFS.py @@ -10,6 +10,7 @@ import os, sys, string import popen2 import shutil +import traceback from Exceptions import * import utils @@ -72,7 +73,7 @@ def Run( vars, log ): log.write( "Missing partition in PARTITIONS: %s\n" % part ) return 0 - bs_request= BootServerRequest.BootServerRequest() + bs_request= BootServerRequest.BootServerRequest(vars) log.write( "turning on swap space\n" ) utils.sysexec( "swapon %s" % PARTITIONS["swap"], log ) @@ -91,31 +92,79 @@ def Run( vars, log ): vars['ROOT_MOUNTED']= 1 # which extensions are we part of ? - utils.breakpoint("Getting the extension tag on node") + utils.breakpoint("Checking for the extension(s) tags") + extensions = [] try: - extension_tag = BootAPI.call_api_function(vars, "GetNodeExtension", ([NODE_ID])) - extensions = extension_tag.split() + extension_tag = BootAPI.call_api_function(vars, "GetNodeExtensions", (NODE_ID,) ) + if extension_tag: + extensions = extension_tag.split() except: - log.write("WARNING : Failed to query the extension tag - installing only core software\n") - extensions = [] + log.write("WARNING : Failed to query tag 'extensions'\n") + log.write(traceback.format_exc()) + + if not extensions: + log.write("installing only core software\n") + # check if the plain-bootstrapfs tag is set + download_suffix=".tar.bz2" + untar_option="-j" + try: + if BootAPI.call_api_function (vars, "GetNodePlainBootstrapfs", (NODE_ID,) ): + download_suffix=".tar" + untar_option="" + except: + log.write("WARNING : Failed to query tag 'plain-bootstrapfs'\n") + log.write(traceback.format_exc()) + + if not untar_option: + log.write("Using uncompressed bootstrapfs images\n") + # see also GetBootMedium in PLCAPI that does similar things # figuring the default node family: - # (1) look at /etc/planetlab/nodefamily on the bootcd - # (2) if that fails, set to planetlab-i386 + # (1) get node's tags 'arch' and 'pldistro' + # (2) if unsuccessful search /etc/planetlab/nodefamily on the bootcd + # (3) if that fails, set to planetlab-i386 + + try: + api_pldistro = BootAPI.call_api_function(vars, "GetNodePldistro", (NODE_ID,) ) + except: + log.write("WARNING : Failed to query tag 'pldistro'\n") + api_pldistro = None + try: + api_arch = BootAPI.call_api_function(vars, "GetNodeArch", (NODE_ID,) ) + except: + log.write("WARNING : Failed to query tag 'arch'\n") + api_arch = None try: - (pldistro,arch) = file("/etc/planetlab/nodefamily").read().strip().split("-") + (etc_pldistro,etc_arch) = file("/etc/planetlab/nodefamily").read().strip().split("-") except: - # what arch should be used for this node - utils.breakpoint("Getting the arch tag on node") - pldistro="planetlab" - default_arch="i386" - try: - arch = BootAPI.call_api_function(vars, "GetNodeArch", ([NODE_ID])) - except: - log.write("WARNING : Failed to query node arch - using %(default_arch)s\n"%locals()) - arch = default_arch + log.write("WARNING : Failed to parse /etc/planetlab/nodefamily\n") + (etc_pldistro,etc_arch)=(None,None) + default_pldistro="planetlab" + default_arch="i386" + + if api_pldistro: + pldistro = api_pldistro + log.write ("Using pldistro from pldistro API tag\n") + elif etc_pldistro: + pldistro = etc_pldistro + log.write ("Using pldistro from /etc/planetlab/nodefamily\n") + else: + pldistro = default_pldistro + log.write ("Using default pldistro\n") + + if api_arch: + arch = api_arch + log.write ("Using arch from arch API tag\n") + elif etc_arch: + arch = etc_arch + log.write ("Using arch from /etc/planetlab/nodefamily\n") + else: + arch = default_arch + log.write ("Using default arch\n") + + log.write ("Using nodefamily=%s-%s\n"%(pldistro,arch)) bootstrapfs_names = [ pldistro ] + extensions @@ -126,7 +175,7 @@ def Run( vars, log ): yum_extensions = [] # download and extract support tarball for this step, for bootstrapfs_name in bootstrapfs_names: - tarball = "bootstrapfs-%s-%s.tar.bz2"%(bootstrapfs_name,arch) + tarball = "bootstrapfs-%s-%s%s"%(bootstrapfs_name,arch,download_suffix) source_file= "%s/%s" % (SUPPORT_FILE_DIR,tarball) dest_file= "%s/%s" % (SYSIMG_PATH, tarball) @@ -138,7 +187,7 @@ def Run( vars, log ): 30, 14400) if result: log.write( "extracting %s in %s\n" % (dest_file,SYSIMG_PATH) ) - result= utils.sysexec( "tar -C %s -xpjf %s" % (SYSIMG_PATH,dest_file), log ) + result= utils.sysexec( "tar -C %s -xpf %s %s" % (SYSIMG_PATH,dest_file,untar_option), log ) log.write( "Done\n") utils.removefile( dest_file ) else: @@ -180,13 +229,12 @@ def Run( vars, log ): utils.sysexec("gpg --homedir=/root --export --armor" \ " --no-default-keyring --keyring %s/usr/boot/pubring.gpg" \ " >%s/etc/pki/rpm-gpg/RPM-GPG-KEY-planetlab" % (SYSIMG_PATH, SYSIMG_PATH)) - utils.sysexec("chroot %s rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-planetlab" % \ - SYSIMG_PATH) + utils.sysexec_chroot(SYSIMG_PATH, "rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-planetlab") # the yum config has changed entirely; # in addition yum installs have more or less never worked - let's forget about this # maybe NodeManager could profitably do the job instead if yum_extensions: - log.write('WARNING : yum installs for node extensions are not supported anymore') + log.write("WARNING : yum installs for node extensions are not supported anymore\n") return 1