From: Joshua Schmid Date: Tue, 12 May 2020 10:10:43 +0000 (+0200) Subject: mgr/cephadm: disable env_var passing until pr#34835 is merged X-Git-Tag: v16.1.0~2341^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F34944%2Fhead;p=ceph.git mgr/cephadm: disable env_var passing until pr#34835 is merged Signed-off-by: Joshua Schmid --- diff --git a/src/pybind/mgr/cephadm/services/osd.py b/src/pybind/mgr/cephadm/services/osd.py index 6c41b3974406..50283e99a970 100644 --- a/src/pybind/mgr/cephadm/services/osd.py +++ b/src/pybind/mgr/cephadm/services/osd.py @@ -30,7 +30,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}"] + # 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] = [] ret_msg = self.create(host, cmd, replace_osd_ids=drive_group.osd_id_claims.get(host, []), env_vars=env_vars) ret.append(ret_msg) return ", ".join(ret)