From: Joshua Schmid Date: Thu, 4 Jun 2020 06:52:38 +0000 (+0200) Subject: mgr/cephadm: re-enable osdspec affinity passing X-Git-Tag: wip-pdonnell-testing-20200918.022351~786^2~1 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=edbb4f2db4834800eb3d005e92ad9497d3451668;p=ceph-ci.git mgr/cephadm: re-enable osdspec affinity passing Signed-off-by: Joshua Schmid --- 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 )