]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
mgr/cephadm: re-enable osdspec affinity passing
authorJoshua Schmid <jschmid@suse.de>
Thu, 4 Jun 2020 06:52:38 +0000 (08:52 +0200)
committerJoshua Schmid <jschmid@suse.de>
Thu, 4 Jun 2020 06:52:38 +0000 (08:52 +0200)
Signed-off-by: Joshua Schmid <jschmid@suse.de>
src/pybind/mgr/cephadm/services/osd.py

index b37f7c586b75f06610de3a1bd1fd8fada3967379..a48b7a1b58a44631ad7200a82d446b4d3ac5ff64 100644 (file)
@@ -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
             )