Merge pull request #1092 from opencrvs/worker-docker-startup-issue

Ensure docker daemon does not depend on cryptfs logic on workers

Author: rikukissa

infrastructure/server-setup/playbook.yml

@@ -87,14 +87,6 @@
             - docker
       tags:
         - docker
-    
-    - include_tasks:
-        file: tasks/override-docker-startup.yml
-        apply:
-          tags: 
-            - docker
-      tags: 
-        - docker
 
     - include_tasks:
         file: tasks/deployment-user.yml
@@ -170,6 +162,13 @@
   become: yes
   become_method: sudo
   tasks:
+    - include_tasks:
+        file: tasks/override-docker-startup.yml
+        apply:
+          tags:
+            - docker
+      tags:
+        - docker
     - include_tasks:
         file: tasks/elasticsearch.yml
         apply:
@@ -186,4 +185,18 @@
       tags:
         - traefik
 
+# Ensure incorrectly created override of docker daemon (1.9 beta) is removed on workers
+- hosts: docker-workers
+  become: yes
+  become_method: sudo
+  tasks:
+    - name: Remove docker service override directory
+      file:
+        path: /etc/systemd/system/docker.service.d
+        state: absent
+
+    - name: Reload systemd daemon to apply changes
+      systemd:
+        daemon_reload: yes
+
 - import_playbook: backups.yml