Fixed merge conflict

2017-08-27 22:41:14 -04:00
parent d3d22bcaf5 a286332d70
commit 017f0dc1de
2 changed files with 9 additions and 0 deletions
--- a/roles/common/tasks/main.yml
+++ b/roles/common/tasks/main.yml
@@ -67,6 +67,12 @@
 - name: Replace fstab file
  template: src=../roles/common/templates/fstab.j2 dest=/etc/fstab

+- name: Replace docker daemon file
+  template: src=../roles/common/templates/docker-daemon.json.j2 dest=/etc/docker/daemon.json
+
+- name: Restart docker service
+  shell: service docker restart
+
 - name: Creates directory
  file: path=/data state=directory