valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

check if docker is running

Browse Source 
This fixes #22559
This commit is contained in:
Mathieu Le Marec - Pasquet 2015-04-12 18:15:21 +02:00
parent bbdf316063
commit 16ec10aa92
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
salt/modules/dockerng.py
View File

@ -460,12 +460,18 @@ def __virtual__():
Only load if docker libs are present
'''
if HAS_DOCKER_PY:
docker_py_versioninfo = _get_docker_py_versioninfo()
try:
docker_py_versioninfo = _get_docker_py_versioninfo()
except CommandExecutionError:
docker_py_versioninfo = None
# Don't let a failure to interpret the version keep this module from
# loading. Log a warning (log happens in _get_docker_py_versioninfo()).
if docker_py_versioninfo is None \
or docker_py_versioninfo >= MIN_DOCKER_PY:
docker_versioninfo = version().get('VersionInfo')
try:
docker_versioninfo = version().get('VersionInfo')
except CommandExecutionError:
docker_versioninfo = None
if docker_versioninfo is None or docker_versioninfo >= MIN_DOCKER:
return __virtualname__
else: