diff options
| author | Thomas Wiest <twiest@users.noreply.github.com> | 2015-12-09 15:49:48 -0500 |
|---|---|---|
| committer | Thomas Wiest <twiest@users.noreply.github.com> | 2015-12-09 15:49:48 -0500 |
| commit | eeb164fae0e6721100c4fcc1717d92bb85b9652c (patch) | |
| tree | 70eee046db8012061c178ab4e686650048265564 /roles/docker/tasks/main.yml | |
| parent | 898290cb3aabbc9d98883181877ac857a2fe1faf (diff) | |
| parent | 14c69ad397be8ee101ef5b4edfa223d703e67ad0 (diff) | |
| download | openshift-eeb164fae0e6721100c4fcc1717d92bb85b9652c.tar.gz openshift-eeb164fae0e6721100c4fcc1717d92bb85b9652c.tar.bz2 openshift-eeb164fae0e6721100c4fcc1717d92bb85b9652c.tar.xz openshift-eeb164fae0e6721100c4fcc1717d92bb85b9652c.zip | |
Merge pull request #1048 from twiest/prod
Sync master -> Prod
Diffstat (limited to 'roles/docker/tasks/main.yml')
| -rw-r--r-- | roles/docker/tasks/main.yml | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml index 96949230d..857674454 100644 --- a/roles/docker/tasks/main.yml +++ b/roles/docker/tasks/main.yml @@ -2,7 +2,14 @@ # tasks file for docker - name: Install docker yum: pkg=docker + when: ansible_pkg_mgr == "yum" + +- name: Install docker + dnf: pkg=docker + when: ansible_pkg_mgr == "dnf" - name: enable and start the docker service service: name=docker enabled=yes state=started +- include: udev_workaround.yml + when: docker_udev_workaround | default(False) |