starlingx
/
distcloud
Code Issues Proposed changes

Invoke the correct gen-bootloader-iso.sh script based on distro 

The gen-bootloader-iso.sh script for CentOS was renamed and invoked in
previous commits to utilities [1] and distributedcloud [2] repos.
However, the renamed script was not packaged and installed
resulting in subcloud deployment failure in CentOS based StarlingX.

The issue is resolved by
https://review.opendev.org/c/starlingx/utilities/+/853023 and this commit.

[1] https://review.opendev.org/c/starlingx/utilities/+/851688
[2] https://review.opendev.org/c/starlingx/distcloud/+/851679

Test Plan:
   - Verify successful subcloud deployment in CentOS
   - Verify proper cleanup of shared and subcloud specific boot files
     post remote install

Closes-Bug: 1986054
Change-Id: If5261f2a96447c4f45ac7c38a785eea10c1802e5
Signed-off-by: Tee Ngo <Tee.Ngo@windriver.com>
This commit is contained in:
Tee Ngo 2022-08-12 17:22:06 -04:00
parent 7bfe0ff9c7
commit 394d1ceff9
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
distributedcloud/dccommon/subcloud_install.py
View File

@ -408,12 +408,21 @@ class SubcloudInstall(object):
os.remove(self.input_iso)
if (self.www_root is not None and os.path.isdir(self.www_root)):
cleanup_cmd = [
GEN_ISO_COMMAND,
"--id", self.name,
"--www-root", self.www_root,
"--delete"
]
if common_utils.is_debian():
cleanup_cmd = [
GEN_ISO_COMMAND,
"--id", self.name,
"--www-root", self.www_root,
"--delete"
]
else:
cleanup_cmd = [
GEN_ISO_COMMAND_CENTOS,
"--id", self.name,
"--www-root", self.www_root,
"--delete"
]
try:
with open(os.devnull, "w") as fnull:
subprocess.check_call( # pylint: disable=E1102