Merge branch 'handling-osd-flag-during-upgrade' of https://github.com/ujjawal-ibm...

Conflicts:
	src/pybind/mgr/orchestrator/module.py

diff --cc src/pybind/mgr/cephadm/module.py
Simple merge

diff --cc src/pybind/mgr/orchestrator/module.py
index b6512be8610487c3ba7201fa0817e196402fc865,a471fc39505589e3148595f98043dff41e935464..c698ca9a29fb3f8026997a1f354a509ab2eca369
--- 1/src/pybind/mgr/orchestrator/module.py
--- 2/src/pybind/mgr/orchestrator/module.py
+++ b/src/pybind/mgr/orchestrator/module.py
@@@ -2576,10 -2573,9 +2577,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())