summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason DeTiberus <jdetiber@redhat.com>2015-02-17 22:40:25 -0500
committerJason DeTiberus <jdetiber@redhat.com>2015-02-24 22:31:56 -0500
commit70b03a84b1f2aa2f92497f96041375165ff4a818 (patch)
tree105755c397979d1befa29c6f491dc78316bc7a52
parent50f53296253953fb2d3fff6bd7d7d3e538b9430b (diff)
downloadopenshift-70b03a84b1f2aa2f92497f96041375165ff4a818.tar.gz
openshift-70b03a84b1f2aa2f92497f96041375165ff4a818.tar.bz2
openshift-70b03a84b1f2aa2f92497f96041375165ff4a818.tar.xz
openshift-70b03a84b1f2aa2f92497f96041375165ff4a818.zip
docker role cleanup
- use service module for enabling/restarting docker service - remove unused role directories/files - use user module for adding the docker group to the root user
-rw-r--r--roles/docker/defaults/main.yml2
-rw-r--r--roles/docker/handlers/main.yml2
-rw-r--r--roles/docker/tasks/main.yml9
-rw-r--r--roles/docker/vars/main.yml2
4 files changed, 3 insertions, 12 deletions
diff --git a/roles/docker/defaults/main.yml b/roles/docker/defaults/main.yml
deleted file mode 100644
index f0327f611..000000000
--- a/roles/docker/defaults/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-# defaults file for docker
diff --git a/roles/docker/handlers/main.yml b/roles/docker/handlers/main.yml
deleted file mode 100644
index a2bea013a..000000000
--- a/roles/docker/handlers/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-# handlers file for docker
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
diff --git a/roles/docker/vars/main.yml b/roles/docker/vars/main.yml
deleted file mode 100644
index 3806b4c7e..000000000
--- a/roles/docker/vars/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-# vars file for docker