Update "apt" tasks to use lists

[AnsibleRoles.git] / roles / docker-engine / tasks / main.yml

diff --git a/roles/docker-engine/tasks/main.yml b/roles/docker-engine/tasks/main.yml
index 46fb78f644a8048ec55d68c4a1efcf724e75f881..acda775602f9e2339ac5375c2f4bc146ed248f83 100644 (file)
--- a/roles/docker-engine/tasks/main.yml
+++ b/roles/docker-engine/tasks/main.yml
@@ -5,12 +5,12 @@
   tags:
     - docker
     - packages
-  apt: >
-    name={{ item }}
-    state=installed
-  with_items:
-    - apt-transport-https
-    - ca-certificates
+  apt:
+    name: [
+      'apt-transport-https',
+      'ca-certificates',
+    ]
+    state: present
   when: docker_apt_repository.startswith("https://")
 
 - name: install docker.io repository GnuPG key
@@ -20,7 +20,7 @@
   copy: >
     dest=/etc/apt/trusted.gpg.d/
     group=root
-    mode=644
+    mode=0644
     owner=root
     src=docker.gpg
   notify:
@@ -33,7 +33,7 @@
   template: >
     dest=/etc/apt/sources.list.d/docker.list
     group=root
-    mode=644
+    mode=0644
     owner=root
     src=docker.list.j2
   notify:
@@ -50,4 +50,16 @@
     - packages
   apt: >
     name=docker-engine
-    state=installed
+    state=present
+
+- name: setup "/etc/docker/daemon.json" file
+  tags:
+    - docker
+  template: >
+    dest=/etc/docker/daemon.json
+    group=root
+    mode=0600
+    owner=root
+    src=daemon.json.j2
+  notify:
+    - reload Docker