summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOpenShift Bot <eparis+openshiftbot@redhat.com>2017-05-14 16:42:19 -0500
committerGitHub <noreply@github.com>2017-05-14 16:42:19 -0500
commitf20bf5310aa6d1b8ca6fb418485b3a90750f9ee9 (patch)
tree49776cb8dd08e8cb081964a81a58f6edab2ff120
parent9cbe2b7bbfc3e4e8321a8a483ef452cb9d5611c7 (diff)
parent08787d246ace705ae2fd0ef6b519e59ee668e357 (diff)
downloadopenshift-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
-rw-r--r--roles/docker/tasks/systemcontainer_docker.yml26
-rwxr-xr-xroles/openshift_facts/library/openshift_facts.py2
2 files changed, 16 insertions, 12 deletions
diff --git a/roles/docker/tasks/systemcontainer_docker.yml b/roles/docker/tasks/systemcontainer_docker.yml
index 4cea266cc..c85801546 100644
--- a/roles/docker/tasks/systemcontainer_docker.yml
+++ b/roles/docker/tasks/systemcontainer_docker.yml
@@ -27,6 +27,20 @@
state: present
when: not openshift.common.is_atomic | bool
+# Make sure Docker is installed so we are able to use the client
+- name: Install Docker so we can use the client
+ package: name=docker{{ '-' + docker_version if docker_version is defined else '' }} state=present
+ when: not openshift.common.is_atomic | bool
+
+# Make sure docker is disabled. Errors are ignored.
+- name: Disable Docker
+ systemd:
+ name: docker
+ enabled: no
+ state: stopped
+ daemon_reload: yes
+ ignore_errors: True
+
# Set http_proxy and https_proxy in /etc/atomic.conf
- block:
@@ -78,17 +92,7 @@
command: "atomic pull --storage ostree {{ l_docker_image }}"
changed_when: false
-# Make sure docker is disabled Errors are ignored as docker may not
-# be installed.
-- name: Disable Docker
- systemd:
- name: docker
- enabled: no
- state: stopped
- daemon_reload: yes
- ignore_errors: True
-
-- name: Ensure docker.service.d directory exists
+- name: Ensure container-engine.service.d directory exists
file:
path: "{{ container_engine_systemd_dir }}"
state: directory
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 = {