summaryrefslogtreecommitdiffstats
path: root/roles/docker-storage-setup
diff options
context:
space:
mode:
authorTomas Sedovic <tomas@sedovic.cz>2017-10-18 14:00:50 +0200
committerTomas Sedovic <tomas@sedovic.cz>2017-10-18 14:00:50 +0200
commit9f69f214958e1c33bf1c082cd7243dca4e8eebb8 (patch)
tree8f3f9b8a89729ade9c482b39a8f630636a341b7c /roles/docker-storage-setup
parent255bda6812c53d39723d0ad2b27698e2d627f3bd (diff)
parent3823c72af11f77b9639176921b398fbab2ac04fd (diff)
downloadopenshift-9f69f214958e1c33bf1c082cd7243dca4e8eebb8.tar.gz
openshift-9f69f214958e1c33bf1c082cd7243dca4e8eebb8.tar.bz2
openshift-9f69f214958e1c33bf1c082cd7243dca4e8eebb8.tar.xz
openshift-9f69f214958e1c33bf1c082cd7243dca4e8eebb8.zip
Merge branch 'master' into openstack-docs
Diffstat (limited to 'roles/docker-storage-setup')
-rw-r--r--roles/docker-storage-setup/tasks/main.yaml5
1 files changed, 3 insertions, 2 deletions
diff --git a/roles/docker-storage-setup/tasks/main.yaml b/roles/docker-storage-setup/tasks/main.yaml
index 209062ca7..dbff85662 100644
--- a/roles/docker-storage-setup/tasks/main.yaml
+++ b/roles/docker-storage-setup/tasks/main.yaml
@@ -1,4 +1,7 @@
---
+- name: stop docker
+ service: name=docker state=stopped
+
- block:
- name: create the docker-storage config file
template:
@@ -7,7 +10,6 @@
owner: root
group: root
mode: 0644
-
when:
- ansible_distribution_version | version_compare('7.4', '>=')
- ansible_distribution == "RedHat"
@@ -20,7 +22,6 @@
owner: root
group: root
mode: 0644
-
when:
- ansible_distribution_version | version_compare('7.4', '<')
- ansible_distribution == "RedHat"