From edbb4f2db4834800eb3d005e92ad9497d3451668 Mon Sep 17 00:00:00 2001 From: Joshua Schmid Date: Thu, 4 Jun 2020 08:52:38 +0200 Subject: [PATCH] mgr/cephadm: re-enable osdspec affinity passing Signed-off-by: Joshua Schmid --- src/pybind/mgr/cephadm/services/osd.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/pybind/mgr/cephadm/services/osd.py b/src/pybind/mgr/cephadm/services/osd.py index b37f7c586b7..a48b7a1b58a 100644 --- a/src/pybind/mgr/cephadm/services/osd.py +++ b/src/pybind/mgr/cephadm/services/osd.py @@ -30,9 +30,7 @@ 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 ) -- 2.47.3