major refactoring of installer roles

1 files changed, 13 insertions, 30 deletions

diff --git a/roles/installer/debian/base/tasks/main.yml b/roles/installer/debian/base/tasks/main.yml
index 65110c91..119b3670 100644
--- a/roles/installer/debian/base/tasks/main.yml
+++ b/roles/installer/debian/base/tasks/main.yml
@@ -1,35 +1,18 @@
 ---
-- name: prepare directories for installer files
+- name: prepare directory keyrings
   file:
-    name: "{{ installer_path }}/{{ debian_installer_distro }}-{{ debian_installer_codename }}/{{ debian_installer_arch }}-{{ debian_installer_variant }}"
+    name: "{{ installer_base_path }}/keyrings"
     state: directory
 
-- name: download and verify installer files
-  block:
-  - name: fetch and verify installer checksums
-    include_tasks: "verify-{{ install_distro }}.yml"
+- name: copy debian keyring files
+  loop: "{{ lookup('fileglob', global_files_dir+'/common/keyrings/debian-*.gpg', wantlist=True) }}"
+  loop_control:
+    label: "{{ item | basename }}"
+  copy:
+    src: "{{ item }}"
+    dest: "{{ installer_base_path }}/keyrings/{{ item | basename }}"
 
-  - name: download installer kernel image
-    get_url:
-      url: "{{ debian_installer_base_url }}/{{ debian_installer_variant_path }}/{{ debian_installer_variant_kernal_image_name }}"
-      dest: "{{ installer_path }}/{{ debian_installer_distro }}-{{ debian_installer_codename }}/{{ debian_installer_arch }}-{{ debian_installer_variant }}/{{ debian_installer_variant_kernal_image_name }}"
-      checksum: "{{ debian_installer_kernel_checksum }}"
-      force: "{{ debian_installer_force_download }}"
-      mode: 0644
-
-  - name: download installer initrd.gz
-    get_url:
-      url: "{{ debian_installer_base_url }}/{{ debian_installer_variant_path }}/initrd.gz"
-      dest: "{{ installer_path }}/{{ debian_installer_distro }}-{{ debian_installer_codename }}/{{ debian_installer_arch }}-{{ debian_installer_variant }}/initrd.gz"
-      checksum: "{{ debian_installer_initrd_checksum }}"
-      force: "{{ debian_installer_force_download }}"
-      mode: 0644
-
-  rescue:
-  - name: remove all downloaded files
-    file:
-      name: "{{ installer_path }}/{{ debian_installer_distro }}-{{ debian_installer_codename }}/{{ debian_installer_arch }}-{{ debian_installer_variant }}"
-      state: absent
-
-  - fail:
-      msg: "download/verification of installer files failed"
+- name: copy ubuntu keyring file
+  copy:
+    src: "{{ global_files_dir }}/common/keyrings/ubuntu-archive.gpg"
+    dest: "{{ installer_base_path }}/keyrings/ubuntu-archive.gpg"