Merge pull request #35374 from jschmid1/activate_osdspec_affinity

mgr/cephadm: re-enable osdspec affinity passing

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>

diff --cc src/pybind/mgr/cephadm/services/osd.py
index 10efea6c1598890edd3a25e92af8b3d02307d37e,a48b7a1b58a44631ad7200a82d446b4d3ac5ff64..65b352ad7a20f69646127b96f05ea4eca87b303f
--- 1/src/pybind/mgr/cephadm/services/osd.py
--- 2/src/pybind/mgr/cephadm/services/osd.py
+++ b/src/pybind/mgr/cephadm/services/osd.py
@@@ -32,11 -30,9 +32,9 @@@ class OSDService(CephadmService)
              if not cmd:
                  logger.debug("No data_devices, skipping DriveGroup: {}".format(drive_group.service_id))
                  continue
-             # env_vars = [f"CEPH_VOLUME_OSDSPEC_AFFINITY={drive_group.service_id}"]
-             # disable this until https://github.com/ceph/ceph/pull/34835 is merged
-             env_vars: List[str] = []
+             env_vars: List[str] = [f"CEPH_VOLUME_OSDSPEC_AFFINITY={drive_group.service_id}"]
              ret_msg = self.create_single_host(
 -                host, cmd, replace_osd_ids=drive_group.osd_id_claims.get(host, []), env_vars=env_vars
 +                host, cmd, replace_osd_ids=osd_id_claims.get(host, []), env_vars=env_vars
              )
              ret.append(ret_msg)
          return ", ".join(ret)

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