]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
orch/cephadm: Fixes a unlimited env append in cephadm agent
authorRafal Wadolowski <rafal.wadolowski@cleura.com>
Tue, 2 Dec 2025 12:06:29 +0000 (13:06 +0100)
committerRafal Wadolowski <rafal.wadolowski@cleura.com>
Tue, 2 Dec 2025 12:06:29 +0000 (13:06 +0100)
We will check if environment variable exist before adding it.

Fixes: https://tracker.ceph.com/issues/74053
Signed-off-by: Rafal Wadolowski <rafal.wadolowski@cleura.com>
src/cephadm/cephadm.py

index 4e255e551656bf9e793c3bfa7916937c0730adf9..bcd5989c45ad80629ec29c886fc99de07a333918 100755 (executable)
@@ -832,8 +832,10 @@ def get_ceph_volume_container(ctx: CephadmContext,
                               envs: Optional[List[str]] = None) -> 'CephContainer':
     if envs is None:
         envs = []
-    envs.append('CEPH_VOLUME_SKIP_RESTORECON=yes')
-    envs.append('CEPH_VOLUME_DEBUG=1')
+    if 'CEPH_VOLUME_SKIP_RESTORECON=yes' not in envs:
+        envs.append('CEPH_VOLUME_SKIP_RESTORECON=yes')
+    if 'CEPH_VOLUME_DEBUG=1' not in envs:
+        envs.append('CEPH_VOLUME_DEBUG=1')
 
     return CephContainer(
         ctx,