Fixed merge conflict

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
 

roles/common/templates/docker-daemon.json.j2

@@ -0,0 +1,3 @@
+{
+  "insecure-registries" : ["registry:5000"]
+}