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 2d4ae5121a7d69c4574fe09f569e1ac86aeec2ef..44c316be20556e406f7df423c2711a1a66968122 100644 (file)
--- 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 d5b107c4c38518f4156b8b3730ae78eb9c182c41..1142eb0e1cf67e588ef320acd8326dcef9aae4e3 100644 (file)
--- 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 8ddab13f4dd6b703ff48f14a4d4018922731f4ae..a9310ad8ae638660d07c43630f2f5d3a15562ef1 100644 (file)
--- 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 533d58fa252166c1cbeae5aa269682902db9b796..b58a9289c0aa57ef9e517e9590013a4c5ee98741 100644 (file)
--- 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