diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-05-14 16:42:19 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-14 16:42:19 -0500 |
| commit | f20bf5310aa6d1b8ca6fb418485b3a90750f9ee9 (patch) | |
| tree | 49776cb8dd08e8cb081964a81a58f6edab2ff120 /roles/openshift_facts | |
| parent | 9cbe2b7bbfc3e4e8321a8a483ef452cb9d5611c7 (diff) | |
| parent | 08787d246ace705ae2fd0ef6b519e59ee668e357 (diff) | |
| download | openshift-f20bf5310aa6d1b8ca6fb418485b3a90750f9ee9.tar.gz openshift-f20bf5310aa6d1b8ca6fb418485b3a90750f9ee9.tar.bz2 openshift-f20bf5310aa6d1b8ca6fb418485b3a90750f9ee9.tar.xz openshift-f20bf5310aa6d1b8ca6fb418485b3a90750f9ee9.zip | |
Merge pull request #4184 from ashcrow/rslave
Merged by openshift-bot
Diffstat (limited to 'roles/openshift_facts')
| -rwxr-xr-x | roles/openshift_facts/library/openshift_facts.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py index 914e46c05..514c06500 100755 --- a/roles/openshift_facts/library/openshift_facts.py +++ b/roles/openshift_facts/library/openshift_facts.py @@ -1302,7 +1302,7 @@ def get_version_output(binary, version_cmd): def get_docker_version_info(): """ Parses and returns the docker version info """ result = None - if is_service_running('docker'): + if is_service_running('docker') or is_service_running('container-engine'): version_info = yaml.safe_load(get_version_output('/usr/bin/docker', 'version')) if 'Server' in version_info: result = { |