commit 3ccc9e1a4f77495511a225b67f9a3d9151197a2c
author Filip Pytloun <fpytloun@mirantis.com> Thu Mar 02 12:48:21 2017 +0000
committer Gerrit Code Review <gerrit2@0048eb735cd7> Thu Mar 02 12:48:21 2017 +0000
tree 6e159d8de652b4adb39658a25e6731d85a93e223
parent 08afe16501e59b0877dd6343d5711de8892da22e
parent 04707154e433b57cf2153d8cf13b9b2ce3469f11

Merge "Fix preventing error message output"

_grains/docker_swarm.py

diff --git a/_grains/docker_swarm.py b/_grains/docker_swarm.py
index 321697d..8dd6dc7 100644
--- a/_grains/docker_swarm.py
+++ b/_grains/docker_swarm.py
@@ -11,7 +11,7 @@
 
     if os.path.exists('/var/lib/docker/swarm'):
         try:
-            inspect = json.loads(subprocess.check_output(["docker", "node", "inspect", "self"]).strip())[0]
+            inspect = json.loads(subprocess.check_output(["docker", "node", "inspect", "self"], stderr=subprocess.STDOUT).strip())[0]
         except subprocess.CalledProcessError:
             return None