summaryrefslogtreecommitdiffstats
path: root/roles/docker/tasks/main.yml
diff options
context:
space:
mode:
authorMatt Woodson <mwoodson@redhat.com>2015-02-24 10:16:20 -0500
committerMatt Woodson <mwoodson@redhat.com>2015-02-24 10:16:20 -0500
commit41ad58a9b9cd59eb5d8bece20d0c1073190d67b4 (patch)
tree7f11cf6a031a5c8b0efe9618c7ec3476c39fcbb8 /roles/docker/tasks/main.yml
parentf780d4fa01a1e8b1559d31a7065715317a884ec4 (diff)
parent0d0b7fa2bba160e8d04ba0f67a0de5c7a06499db (diff)
downloadopenshift-41ad58a9b9cd59eb5d8bece20d0c1073190d67b4.tar.gz
openshift-41ad58a9b9cd59eb5d8bece20d0c1073190d67b4.tar.bz2
openshift-41ad58a9b9cd59eb5d8bece20d0c1073190d67b4.tar.xz
openshift-41ad58a9b9cd59eb5d8bece20d0c1073190d67b4.zip
Merge branch 'master' into tower_install
Conflicts: lib/aws_command.rb
Diffstat (limited to 'roles/docker/tasks/main.yml')
-rw-r--r--roles/docker/tasks/main.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml
index 2223bb675..2e9de3abe 100644
--- a/roles/docker/tasks/main.yml
+++ b/roles/docker/tasks/main.yml
@@ -1,7 +1,7 @@
---
# tasks file for docker
- name: Install docker
- yum: pkg=docker
+ yum: pkg=docker-io
- name: enable docker service
command: /usr/bin/systemctl enable docker.service