From: Adam King Date: Tue, 24 Feb 2026 15:09:35 +0000 (-0500) Subject: Merge branch 'handling-osd-flag-during-upgrade' of https://github.com/ujjawal-ibm... X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1c7abe0083358030f3398e5eb2f477b7d4987475;p=ceph-ci.git Merge branch 'handling-osd-flag-during-upgrade' of https://github.com/ujjawal-ibm/ceph into wip-adk3-testing-2026-02-24-1005 Conflicts: src/pybind/mgr/orchestrator/module.py --- 1c7abe0083358030f3398e5eb2f477b7d4987475 diff --cc src/pybind/mgr/orchestrator/module.py index a101231064f,a471fc39505..3e31d8eb445 --- a/src/pybind/mgr/orchestrator/module.py +++ b/src/pybind/mgr/orchestrator/module.py @@@ -2580,10 -2573,9 +2581,10 @@@ Usage ceph_version: Optional[str] = None) -> HandleCommandResult: """Initiate upgrade""" self._upgrade_check_image_name(image, ceph_version) - dtypes = daemon_types.split(',') if daemon_types is not None else None - service_names = services.split(',') if services is not None else None + # Split comma-separated lists and trim whitespace so "mon, crash" and "mon,crash" are equivalent. + dtypes = [d.strip() for d in daemon_types.split(',')] if daemon_types is not None else None + service_names = [s.strip() for s in services.split(',')] if services is not None else None - completion = self.upgrade_start(image, ceph_version, dtypes, hosts, service_names, limit) + completion = self.upgrade_start(image, ceph_version, dtypes, hosts, service_names, limit, no_osd_flags) raise_if_exception(completion) return HandleCommandResult(stdout=completion.result_str())