From: Sebastian Wagner <sebastian.wagner@suse.com>
Date: Fri, 3 Jul 2020 10:01:53 +0000 (+0200)
Subject: Merge pull request #35374 from jschmid1/activate_osdspec_affinity
X-Git-Tag: wip-pdonnell-testing-20200918.022351~786
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7b05e649a89bef0e9977fc7ea8df9545e08ae09d;p=ceph-ci.git

Merge pull request #35374 from jschmid1/activate_osdspec_affinity

mgr/cephadm: re-enable osdspec affinity passing

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

7b05e649a89bef0e9977fc7ea8df9545e08ae09d
diff --cc src/pybind/mgr/cephadm/services/osd.py
index 10efea6c159,a48b7a1b58a..65b352ad7a2
--- a/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)