summaryrefslogtreecommitdiffstats
path: root/roles/docker/tasks
diff options
context:
space:
mode:
authorThomas Wiest <twiest@users.noreply.github.com>2015-02-28 13:30:54 -0500
committerThomas Wiest <twiest@users.noreply.github.com>2015-02-28 13:30:54 -0500
commit40d4af7d2760ec625155c726962615a79f4ce114 (patch)
tree6e6799afc45d36c6037cc1c9ddfe2e697fbdc301 /roles/docker/tasks
parentcc92e60f7d64b1fa1fa6812ea73a5779eef54a07 (diff)
parent70b03a84b1f2aa2f92497f96041375165ff4a818 (diff)
downloadopenshift-40d4af7d2760ec625155c726962615a79f4ce114.tar.gz
openshift-40d4af7d2760ec625155c726962615a79f4ce114.tar.bz2
openshift-40d4af7d2760ec625155c726962615a79f4ce114.tar.xz
openshift-40d4af7d2760ec625155c726962615a79f4ce114.zip
Merge pull request #83 from detiber/cleanupDockerrole
docker role cleanup
Diffstat (limited to 'roles/docker/tasks')
-rw-r--r--roles/docker/tasks/main.yml9
1 files changed, 3 insertions, 6 deletions
diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml
index 2e9de3abe..2ecefd588 100644
--- a/roles/docker/tasks/main.yml
+++ b/roles/docker/tasks/main.yml
@@ -3,16 +3,13 @@
- name: Install docker
yum: pkg=docker-io
-- name: enable docker service
- command: /usr/bin/systemctl enable docker.service
-
-- name: start the docker service
- command: /usr/bin/systemctl start docker.service
+- name: enable and start the docker service
+ service: name=docker enabled=yes state=started
- copy: src=enter-container.sh dest=/usr/local/bin/enter-container.sh mode=0755
# From the origin rpm there exists instructions on how to
# setup origin properly. The following steps come from there
- name: Change root to be in the Docker group
- command: usermod -G docker -a root
+ user: name=root groups=docker append=yes