From bafaf13c2896ef8af49c16a802fe7b775e2078f7 Mon Sep 17 00:00:00 2001
From: Andrei Stepanov <astepano@redhat.com>
Date: Apr 18 2019 09:23:02 +0000
Subject: Merge #331 `docker: Use is-active to determine docker status`


---

diff --git a/inventory/standard-inventory-docker b/inventory/standard-inventory-docker
index bc3371d..d4ef327 100755
--- a/inventory/standard-inventory-docker
+++ b/inventory/standard-inventory-docker
@@ -86,13 +86,18 @@ def inv_host(subject, docker_extra_args):
         raise RuntimeError("Could not parse DOCKER_EXTRA_ARGS")
     logger.info("Launching Docker container for {0}".format(image))
     # Make sure the docker service is running
-    cmd = [
-        "/usr/bin/systemctl", "start", "docker"
-    ]
     try:
-        subprocess.check_call(cmd, stdout=sys.stderr.fileno())
+        subprocess.check_call(["/usr/bin/systemctl", "is-active", "--quiet", "docker"],
+                              stdout=sys.stderr.fileno())
     except subprocess.CalledProcessError:
-        raise RuntimeError("Could not start docker service")
+        try:
+            cmd = [
+                "/usr/bin/systemctl", "start", "docker"
+            ]
+            subprocess.check_call(cmd, stdout=sys.stderr.fileno())
+        except subprocess.CalledProcessError:
+            raise RuntimeError("Could not start docker service")
+
     # And launch the actual container
     cmd = [
         "/usr/bin/docker", "run", "--detach", "--cidfile={0}".format(cidfile),