Update Branch from Master

all/common/tasks/main.yml

@@ -6,36 +6,45 @@
 
 - name: install apt-transport-https packages before adding sources
   apt:
-    pkg: "{{ item }}"
+    name: "{{ packages }}"
     update_cache: yes
     state: present
-  with_items:
-    - apt-transport-https
+  vars:
+    packages:
+      - apt-transport-https
     - ca-certificates
     - curl
     - gnupg2
     - software-properties-common
 
-- name: add debian repo keys
+- name: add debian repo keys (id)
+  apt_key:
+    id: "{{ item }}"
+    state: present
+  with_items: "{{ debian_keys_id }}"
+  when: debian_keys_id
+
+- name: add debian repo keys (url)
   apt_key:
     url: "{{ item }}"
     state: present
-  with_items: "{{ debian_keys }}"
-  when: debian_keys
+  with_items: "{{ debian_keys_url }}"
+  when: debian_keys_url
 
 - name: set debian repos
   template: src=sources.list.j2 dest=/etc/apt/sources.list
 
 - name: install common packages
   apt:
-    pkg: "{{ item }}"
+    name: "{{ packages }}"
     update_cache: yes
     state: present
-  with_items:
-    - vim
-    - wget
-    - psmisc
-    - tree
+  vars:
+    packages:
+      - vim
+      - wget
+      - psmisc
+      - tree
 
 - name: deploy sshd config
   template: src=sshd_config.j2 dest=/etc/ssh/sshd_config