rename docker_info module to docker_facts

openshift · Mar 10, 2017 · 43680e3 · 43680e3
1 parent 9ebc9c9
commit 43680e3
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 13 deletions.
diff --git a/...ift_health_checker/library/docker_info.py → ...ft_health_checker/library/docker_facts.py b/...ift_health_checker/library/docker_info.py → ...ft_health_checker/library/docker_facts.py
@@ -16,9 +16,8 @@ def main():
     client.module.exit_json(
         changed=False,
         ansible_facts={
-            "docker_client": client,
+            "docker_facts": client.info(),
         },
-        info=client.info(),
     )
 
 

diff --git a/roles/openshift_health_checker/openshift_checks/diskspace_availability.py b/roles/openshift_health_checker/openshift_checks/diskspace_availability.py
@@ -23,8 +23,8 @@ def run(self, tmp, task_vars):
         # if running containerized installation check
         # that available space is not below 5% instead
         if is_containerized:
-            docker_info = self.module_executor("docker_info", {}, task_vars)
-            info = docker_info.get("info")
+            docker_facts = self.module_executor("docker_facts", {}, task_vars)
+            info = docker_facts.get("docker_facts")
             status = dict(info.get("DriverStatus"))
 
             if info.get("Driver", None) == self.supported_docker_dev_driver:
@@ -54,17 +54,17 @@ def run(self, tmp, task_vars):
 
     @staticmethod
     def get_disk_space(ansible_mounts):
-        if len(ansible_mounts):
-            root_size_available = None
-            for mnt in ansible_mounts:
-                if mnt.get("mount") == "/":
-                    root_size_available = mnt.get("size_available")
-                if mnt.get("mount") == "/var":
-                    return mnt.get("size_available")
+        if not ansible_mounts:
+            return None
 
-            return root_size_available
+        root_size_available = None
+        for mnt in ansible_mounts:
+            if mnt.get("mount") == "/":
+                root_size_available = mnt.get("size_available")
+            if mnt.get("mount") == "/var":
+                return mnt.get("size_available")
 
-        return None
+        return root_size_available
 
     @staticmethod
     def to_gibibytes(total_bytes):