TMP

tasks/main.yml

@@ -4,21 +4,21 @@
 
 - name: Add Repository Credentials
   ansible.builtin.copy:
-    content: "machine {{ item.credentials.machine }} login {{ item.credentials.login }} password {{ item.credentials.password }}"
-    dest: "/etc/apt/auth.conf.d/{{ item.credentials.base_name }}.conf"
+    content: "machine {{ item.machine }} login {{ item.login }} password {{ item.password }}"
+    dest: "/etc/apt/auth.conf.d/{{ item.base_name }}.conf"
     mode: "0640"
     owner: root
     group: root
-  when: item.credentials is defined
-  with_items: "{{ _ops_tools.apt_repos | default([]) }}"
+  when: item.login is defined
+  with_items: "{{ _ops_tools.credentials | default([]) }}"
   register: new_credentials
 
 - name: Download APT keys
   ansible.builtin.get_url:
     url: "{{ item.key_url }}"
     dest: "{{ item.key_file }}"
     mode: 0644
-  when: item.key_url is defined
+  when: item.key_url is defined and item.key_file is defined
   with_items: "{{ _ops_tools.apt_repos | default([]) }}"
   register: new_keys_by_url
 
@@ -57,8 +57,8 @@
     suites: "{{ item.suites }}"
     components: "{{ item.components }}"
     signed_by: "{{ item.signed_by }}"
-  when: item.deb822_repository is defined
-  with_items: "{{ _ops_tools.apt_repos | default([]) }}"
+  when: item.name is defined
+  with_items: "{{ _ops_tools.deb822_repository | default([]) }}"
   register: new_deb822
 
 - name: Update APT Cache # noqa: no-handler