From 7fc1263ec825ba80dca655c395ad0b00350c9d4a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bar=C4=B1=C5=9F=20Metin?= Date: Wed, 25 Nov 2009 22:22:04 +0000 Subject: [PATCH] revert previous commit for deployment tag. bootmanager + nodeconfig + myplc: they provide the very same functionality altogether. --- source/steps/InstallBootstrapFS.py | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/source/steps/InstallBootstrapFS.py b/source/steps/InstallBootstrapFS.py index 6065a4d..2c49acc 100644 --- a/source/steps/InstallBootstrapFS.py +++ b/source/steps/InstallBootstrapFS.py @@ -91,18 +91,6 @@ def Run( vars, log ): vars['ROOT_MOUNTED']= 1 - # check deployment (if it's alpha?) - deployment = "" - try: - node_tag_ids = BootAPI.call_api_function(vars, "GetNodes", (NODE_ID,))[0]['node_tag_ids'] - node_tags = BootAPI.call_api_function(vars, "GetNodeTags", (node_tag_ids,)) - deployment_tag = [x for x in node_tags if x['tagname'] == 'deployment'] - if deployment_tag: - deployment = deployment_tag[0]['value'] - except: - log.write("WARNING : Failed to query tag 'deployment'\n") - log.write(traceback.format_exc()) - # which extensions are we part of ? utils.breakpoint("Checking for the extension(s) tags") extensions = [] @@ -188,12 +176,8 @@ def Run( vars, log ): # download and extract support tarball for this step, for bootstrapfs_name in bootstrapfs_names: tarball = "bootstrapfs-%s-%s%s"%(bootstrapfs_name,arch,download_suffix) - if len(deployment): - # we keep bootstrapfs tarballs for deployments in a - # sub-folder, but with same filenames - tarball = "%s/%s" %(deployment, tarball) source_file= "%s/%s" % (SUPPORT_FILE_DIR,tarball) - dest_file= "%s/%s" % (SYSIMG_PATH, os.path.basename(tarball)) + dest_file= "%s/%s" % (SYSIMG_PATH, tarball) # 30 is the connect timeout, 14400 is the max transfer time in # seconds (4 hours) -- 2.43.0