diff options
| author | Joshua Schmid <jschmid@suse.de> | 2020-05-12 12:10:43 +0200 |
|---|---|---|
| committer | Joshua Schmid <jschmid@suse.de> | 2020-05-12 12:10:43 +0200 |
| commit | 8f275834ff4a5adcda165ea39e263840e5dd139a (patch) | |
| tree | 050b788b2b8e97d610d7059d34e3f7844ae7485b /src/pybind/mgr/cephadm/services | |
| parent | mgr/cephadm: generate and pass env vars to cephadm (diff) | |
| download | ceph-8f275834ff4a5adcda165ea39e263840e5dd139a.tar.xz ceph-8f275834ff4a5adcda165ea39e263840e5dd139a.zip | |
mgr/cephadm: disable env_var passing until pr#34835 is merged
Signed-off-by: Joshua Schmid <jschmid@suse.de>
Diffstat (limited to 'src/pybind/mgr/cephadm/services')
| -rw-r--r-- | src/pybind/mgr/cephadm/services/osd.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/pybind/mgr/cephadm/services/osd.py b/src/pybind/mgr/cephadm/services/osd.py index 6c41b397440..50283e99a97 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) |