starlingx/update
Code Issues Proposed changes

Copy from-release pxeboot-update script to deployed /etc

Browse Source 
During the major release deployment for multinode systems
there will be a timeframe where hosts will be partially
upgraded to to-release and hosts still not upgraded, running
from-release, and if the need comes to lock/unlock these
hosts in this period, the controllers must have the
pxeboot-update-<release>.sh script for both release, otherwise
the unlock procedure can fail due to these missing scripts.

This commit ensures that during the controllers deployment,
which are the first hosts to be upgraded, that both scripts
for from/to-release are put in /etc so that the failure
mentioned previously is avoided.

This commit also improves the logging around the agent hook
that manages the pxe files, to log the error messages accordingly
when exceptions raise.

Test Plan
PASS: Storage - in major release deploy, in a scenario where the
      system is partially in from and partially in to-release,
      lock/unlock storage and compute hosts and verify no failures
      (given the lock/unlock respect other existing rules for USM)

Story: 2010676
Task: 51241

Change-Id: I01b088904177b784ba2153a21c0c581f0ae111d1
Signed-off-by: Heitor Matsui <heitorvieira.matsui@windriver.com>
This commit is contained in:
Heitor Matsui 2024-10-30 17:12:25 -03:00
parent 80dc57f337
commit d0e6b7f812
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
software/software/agent_hooks.py
View File

@ -19,6 +19,7 @@ import software.utils as utils
class BaseHook(object):
"""Base Hook object"""
DEPLOYED_OSTREE_DIR = "/ostree/1"
ROLLBACK_OSTREE_DIR = "/ostree/2"
SYSTEMD_LIB_DIR = "/lib/systemd/system"
SYSTEMD_ETC_DIR = "%s/etc/systemd/system/multi-user.target.wants" % DEPLOYED_OSTREE_DIR
@ -106,16 +107,26 @@ class CopyPxeFilesHook(BaseHook):
if self._major_release:
# copy to_release pxeboot files to /var/pxeboot/pxelinux.cfg.files
pxeboot_dst_dir = "/var/pxeboot/pxelinux.cfg.files/"
pxeboot_src_dir = "/ostree/1" + pxeboot_dst_dir # deployed to-release ostree dir
pxeboot_src_dir = self.DEPLOYED_OSTREE_DIR + pxeboot_dst_dir # deployed to-release ostree dir
cmd = "rsync -ac %s %s" % (pxeboot_src_dir, pxeboot_dst_dir)
try:
subprocess.check_call(cmd, shell=True)
LOG.info(
"Copied %s pxeboot files to %s." % (
self._major_release, pxeboot_dst_dir))
subprocess.run(cmd, shell=True, check=True, capture_output=True)
LOG.info("Copied %s pxeboot files to %s" %
(self._major_release, pxeboot_dst_dir))
except subprocess.CalledProcessError as e:
LOG.exception("Error copying pxeboot files from %s to %s: %s" % (
pxeboot_src_dir, pxeboot_dst_dir, str(e)))
pxeboot_src_dir, pxeboot_dst_dir, e.stderr.decode("utf-8")))
raise
# ensure the script pxeboot-update-<from-release>.sh is in to-release /etc
try:
cmd = "rsync -aci %s %s/etc" % (self.ROLLBACK_OSTREE_DIR + "/etc/pxeboot-update-*.sh",
self.DEPLOYED_OSTREE_DIR)
output = subprocess.run(cmd, shell=True, check=True, capture_output=True)
LOG.info("Copied pxeboot-update-*.sh to /etc: %s" % output.stdout.decode("utf-8"))
except subprocess.CalledProcessError as e:
LOG.exception("Error copying pxeboot-update-*.sh to /etc: %s" %
e.stderr.decode("utf-8"))
raise
else:
LOG.error("Cannot copy pxeboot files, major_release value is %s" %