starlingx/distcloud
Code Issues Proposed changes

Merge "Add wipe_osds optional install value"

Browse Source
This commit is contained in:
Zuul 2025-03-21 18:06:20 +00:00 committed by Gerrit Code Review
commit acba41b0b7
3 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
distributedcloud/dccommon/consts.py
View File

@ -284,6 +284,7 @@ OPTIONAL_INSTALL_VALUES = [
"persistent_size", "persistent_size",
"hw_settle", "hw_settle",
"extra_boot_params", "extra_boot_params",
"wipe_osds",
] ]
GEN_ISO_OPTIONS = { GEN_ISO_OPTIONS = {
@ -300,6 +301,7 @@ GEN_ISO_OPTIONS = {
"persistent_size": "--param", "persistent_size": "--param",
"hw_settle": "--param", "hw_settle": "--param",
"extra_boot_params": "--param", "extra_boot_params": "--param",
"wipe_osds": "--param",
} }
SUPPORTED_INSTALL_TYPES = 6 SUPPORTED_INSTALL_TYPES = 6

5
distributedcloud/dccommon/subcloud_install.py
View File

@ -393,6 +393,11 @@ class SubcloudInstall(object):
consts.GEN_ISO_OPTIONS[key], consts.GEN_ISO_OPTIONS[key],
("extra_boot_params=%s" % str(values[key])), ("extra_boot_params=%s" % str(values[key])),
] ]
elif key == "wipe_osds":
update_iso_cmd += [
consts.GEN_ISO_OPTIONS[key],
"wipe_osds=%s" % (1 if values[key] else 0),
]
else: else:
update_iso_cmd += [consts.GEN_ISO_OPTIONS[key], str(values[key])] update_iso_cmd += [consts.GEN_ISO_OPTIONS[key], str(values[key])]

4
distributedcloud/dcmanager/manager/subcloud_manager.py
View File

@ -2475,6 +2475,10 @@ class SubcloudManager(manager.Manager):
data_install["image"] = matching_iso data_install["image"] = matching_iso
data_install["ansible_ssh_pass"] = payload["sysadmin_password"] data_install["ansible_ssh_pass"] = payload["sysadmin_password"]
data_install["ansible_become_pass"] = payload["sysadmin_password"] data_install["ansible_become_pass"] = payload["sysadmin_password"]
# Set "wipe_osds" to false to preserve Ceph OSD partition during
# a backup restore. By default, the Ceph OSD partition will be wiped
# if "wipe_osds" is not explicitly set in the data_install dictionary.
data_install["wipe_osds"] = False
# Notify dcorch of the software version update # Notify dcorch of the software version update
if subcloud.software_version != software_version: if subcloud.software_version != software_version: