From: Joshua Schmid <jschmid@suse.de>
Date: Tue, 12 May 2020 10:08:52 +0000 (+0200)
Subject: python-common: do not pass envs after entrypoint
X-Git-Tag: v15.2.4~73^2~27
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a4e89ef593cf7e6b0feb73807fd8da7010fec1bf;p=ceph.git

python-common: do not pass envs after entrypoint

Signed-off-by: Joshua Schmid <jschmid@suse.de>
(cherry picked from commit 726cabc75b30e4163f486ac014d193fa76ebf958)
---

diff --git a/src/python-common/ceph/deployment/translate.py b/src/python-common/ceph/deployment/translate.py
index 3e82a788976..2412e861867 100644
--- a/src/python-common/ceph/deployment/translate.py
+++ b/src/python-common/ceph/deployment/translate.py
@@ -101,7 +101,4 @@ class to_ceph_volume(object):
             cmd += " --report"
             cmd += " --format json"
 
-        if self.spec.service_id is not None:
-            cmd = f"CEPH_VOLUME_OSDSPEC_AFFINITY={self.spec.service_id} " + cmd
-
         return cmd