Merge pull request #69 from mrsheepuk/DockerConfigSystemD

Support for DOCKER_OPTS on Ubuntu 15.04
angstwad · Oct 3, 2015 · 4248df4 · 4248df4
2 parents a4188ac + 77a275e
commit 4248df4
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 1 deletion.
diff --git a/handlers/main.yml b/handlers/main.yml
@@ -6,5 +6,11 @@
 - name: Reload docker
   service: name=docker state=reloaded
 
+- name: Reload systemd
+  command: systemctl daemon-reload  
+
+- name: Restart docker
+  service: name=docker state=restarted
+
 - name: Restart dockerio
   service: name=docker.io state=restarted
diff --git a/tasks/main.yml b/tasks/main.yml
@@ -37,7 +37,40 @@
     mode: 0644
   notify:
     - Reload docker
-  when: docker_opts != ""
+  when: docker_opts != "" and ansible_distribution_version|version_compare(15.04, '<')
+
+- name: Create systemd configuration directory for Docker service (systemd)
+  file: 
+    dest: /etc/systemd/system/docker.service.d 
+    state: directory
+    owner: root
+    group: root
+    mode: 0755 
+  when: docker_opts != "" and ansible_distribution_version|version_compare(15.04, '>=')
+
+- name: Set docker daemon options (systemd)
+  copy:
+    content: |
+      [Service]
+      Environment="DOCKER_OPTS={{ docker_opts.rstrip('\n') }}"
+    dest: /etc/systemd/system/docker.service.d/env.conf
+    owner: root
+    group: root
+    mode: 0644
+  notify:
+    - Reload systemd
+    - Restart docker
+  when: docker_opts != "" and ansible_distribution_version|version_compare(15.04, '>=')
+
+- name: Ensure docker daemon options used (systemd)
+  lineinfile:
+    dest: /lib/systemd/system/docker.service
+    regexp: "ExecStart=/usr/bin/docker daemon -H fd://"
+    line: ExecStart=/usr/bin/docker daemon -H fd:// $DOCKER_OPTS
+  notify:
+    - Reload systemd
+    - Restart docker
+  when: docker_opts != "" and ansible_distribution_version|version_compare(15.04, '>=')
 
 - name: Fix DNS in docker.io
   lineinfile: