3 files changed, 13 insertions, 81 deletions
diff --git a/roles/installer/debian/base/defaults/main.yml b/roles/installer/debian/base/defaults/main.yml
deleted file mode 100644
index fe6d880d..00000000
--- a/roles/installer/debian/base/defaults/main.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-debian_installer_distros:
-  - distro: debian
-    codename: stretch
-    arch:
-      - amd64
-      - i386
-  - distro: debian
-    codename: buster
-    arch:
-      - amd64
-      - i386
-
-  - distro: ubuntu
-    codename: bionic
-    arch:
-      - amd64
-      - i386
-  - distro: ubuntu
-    codename: focal
-    arch:
-      - amd64
-
-debian_installer_force_download: no
-debian_installer_url:
-#  debian: "https://debian.ffgraz.net/debian"
-#  ubuntu: "https://debian.ffgraz.net/ubuntu"
-  debian: "http://deb.debian.org/debian"
-  ubuntu: "http://archive.ubuntu.com/ubuntu"
diff --git a/roles/installer/debian/base/filter_plugins/main.py b/roles/installer/debian/base/filter_plugins/main.py
deleted file mode 100644
index 298e7efd..00000000
--- a/roles/installer/debian/base/filter_plugins/main.py
+++ /dev/null
@@ -1,27 +0,0 @@
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
-
-from ansible import errors
-
-
-def di_images_path(data):
-    try:
-        if data[0] != 'ubuntu':
-            return 'images'
-
-        if data[1] in ['xenial', 'bionic']:
-            return 'images'
-
-        return 'legacy-images'
-    except Exception as e:
-        raise errors.AnsibleFilterError("mountpoint_exists(): %s" % str(e))
-
-
-class FilterModule(object):
-
-    filter_map = {
-        'di_images_path': di_images_path,
-    }
-
-    def filters(self):
-        return self.filter_map
diff --git a/roles/installer/debian/base/tasks/main.yml b/roles/installer/debian/base/tasks/main.yml
index f7841572..119b3670 100644
--- a/roles/installer/debian/base/tasks/main.yml
+++ b/roles/installer/debian/base/tasks/main.yml
@@ -1,31 +1,18 @@
-- name: prepare directories for installer images
-  loop: "{{ debian_installer_distros | subelements('arch') }}"
-  loop_control:
-    label: "{{ item.0.distro }}/{{ item.0.codename }} {{ item.1 }}"
+---
+- name: prepare directory keyrings
   file:
-    name: "{{ installer_path }}/{{ item.0.distro }}-{{ item.0.codename }}/{{ item.1 }}"
+    name: "{{ installer_base_path }}/keyrings"
     state: directory
 
-- name: download installer kernel images
-  loop: "{{ debian_installer_distros | subelements('arch') }}"
-  loop_control:
-    label: "{{ item.0.distro }}/{{ item.0.codename }} {{ item.1 }}"
-  get_url:
-    url: "{{ debian_installer_url[item.0.distro] }}/dists/{{ item.0.codename }}/main/installer-{{ item.1 }}/current/{{ [item.0.distro, item.0.codename] | di_images_path }}/netboot/{{ item.0.distro }}-installer/{{ item.1 }}/linux"
-    dest: "{{ installer_path }}/{{ item.0.distro }}-{{ item.0.codename }}/{{ item.1 }}/linux"
-    mode: 0644
-    force: "{{ debian_installer_force_download }}"
-
-- name: download installer initrd.gz
-  loop: "{{ debian_installer_distros | subelements('arch') }}"
+- name: copy debian keyring files
+  loop: "{{ lookup('fileglob', global_files_dir+'/common/keyrings/debian-*.gpg', wantlist=True) }}"
   loop_control:
-    label: "{{ item.0.distro }}/{{ item.0.codename }} {{ item.1 }}"
-  get_url:
-    url: "{{ debian_installer_url[item.0.distro] }}/dists/{{ item.0.codename }}/main/installer-{{ item.1 }}/current/{{ [item.0.distro, item.0.codename] | di_images_path }}/netboot/{{ item.0.distro }}-installer/{{ item.1 }}/initrd.gz"
-    dest: "{{ installer_path }}/{{ item.0.distro }}-{{ item.0.codename }}/{{ item.1 }}/initrd.gz"
-    mode: 0644
-    force: "{{ debian_installer_force_download }}"
+    label: "{{ item | basename }}"
+  copy:
+    src: "{{ item }}"
+    dest: "{{ installer_base_path }}/keyrings/{{ item | basename }}"
 
-## TODO verfiy downloaded files using:
-##   "{{ debian_installer_url[item.0.distro] }}/dists/{{ item.0.codename }}/InRelease
-##   "{{ debian_installer_url[item.0.distro] }}/dists/{{ item.0.codename }}/main/installer-{{ item.1 }}/current/{{ [item.0.distro, item.0.codename] | di_images_path }}/SHA256SUMS
+- name: copy ubuntu keyring file
+  copy:
+    src: "{{ global_files_dir }}/common/keyrings/ubuntu-archive.gpg"
+    dest: "{{ installer_base_path }}/keyrings/ubuntu-archive.gpg"