From: Damian Dabrowski <damian.dabrowski@cleura.com>
Date: Wed, 6 May 2026 10:23:00 +0000 (+0200)
Subject: Fix checking CEPH_CONTAINER_IMAGE env var everywhere
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ccc7e4bda5d07eebbd56403436aeecc3e40ef0be;p=ceph-ansible.git

Fix checking CEPH_CONTAINER_IMAGE env var everywhere

Previous commit fixes that only in one place, while it turns
out that there are more places containing the incorrect approach.

Signed-off-by: Damian Dabrowski <damian.dabrowski@cleura.com>
---

diff --git a/library/radosgw_realm.py b/library/radosgw_realm.py
index 2d4ae5121..44c316be2 100644
--- a/library/radosgw_realm.py
+++ b/library/radosgw_realm.py
@@ -120,7 +120,7 @@ def is_containerized():
     Check if we are running on a containerized cluster
     '''
 
-    if 'CEPH_CONTAINER_IMAGE' in os.environ:
+    if os.environ.get('CEPH_CONTAINER_IMAGE'):
         container_image = os.getenv('CEPH_CONTAINER_IMAGE')
     else:
         container_image = None
diff --git a/library/radosgw_user.py b/library/radosgw_user.py
index d5b107c4c..1142eb0e1 100644
--- a/library/radosgw_user.py
+++ b/library/radosgw_user.py
@@ -157,7 +157,7 @@ def is_containerized():
     Check if we are running on a containerized cluster
     '''
 
-    if 'CEPH_CONTAINER_IMAGE' in os.environ:
+    if os.environ.get('CEPH_CONTAINER_IMAGE'):
         container_image = os.getenv('CEPH_CONTAINER_IMAGE')
     else:
         container_image = None
diff --git a/library/radosgw_zone.py b/library/radosgw_zone.py
index 8ddab13f4..a9310ad8a 100644
--- a/library/radosgw_zone.py
+++ b/library/radosgw_zone.py
@@ -149,7 +149,7 @@ def is_containerized():
     Check if we are running on a containerized cluster
     '''
 
-    if 'CEPH_CONTAINER_IMAGE' in os.environ:
+    if os.environ.get('CEPH_CONTAINER_IMAGE'):
         container_image = os.getenv('CEPH_CONTAINER_IMAGE')
     else:
         container_image = None
diff --git a/library/radosgw_zonegroup.py b/library/radosgw_zonegroup.py
index 533d58fa2..b58a9289c 100644
--- a/library/radosgw_zonegroup.py
+++ b/library/radosgw_zonegroup.py
@@ -133,7 +133,7 @@ def is_containerized():
     Check if we are running on a containerized cluster
     '''
 
-    if 'CEPH_CONTAINER_IMAGE' in os.environ:
+    if os.environ.get('CEPH_CONTAINER_IMAGE'):
         container_image = os.getenv('CEPH_CONTAINER_IMAGE')
     else:
         container_image = None