major refactoring of installer roles

3 files changed, 13 insertions, 111 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"
diff --git a/roles/installer/debian/base/tasks/verify-debian.yml b/roles/installer/debian/base/tasks/verify-debian.yml
deleted file mode 100644
index 5a890b1d..00000000
--- a/roles/installer/debian/base/tasks/verify-debian.yml
+++ /dev/null
@@ -1,46 +0,0 @@
----
-- name: download Release and Signature file
-  loop:
-  - Release
-  - Release.gpg
-  get_url:
-    url: "{{ debian_installer_base_url | dirname | dirname | dirname | dirname }}/{{ item }}"
-    dest: "{{ installer_path }}/{{ debian_installer_distro }}-{{ debian_installer_codename }}/{{ debian_installer_arch }}-{{ debian_installer_variant }}/{{ item }}"
-
-- name: verfiy signature of Release file
-  command: >-
-    gpg --no-options --trust-model always --no-default-keyring  --secret-keyring /dev/null
-        --keyring "{{ global_files_dir }}/common/keyrings/debian-{{ install_codename }}.gpg"
-        --verify "{{ installer_path }}/{{ debian_installer_distro }}-{{ debian_installer_codename }}/{{ debian_installer_arch }}-{{ debian_installer_variant }}/Release.gpg"
-        "{{ installer_path }}/{{ debian_installer_distro }}-{{ debian_installer_codename }}/{{ debian_installer_arch }}-{{ debian_installer_variant }}/Release"
-  changed_when: False
-  register: debian_installer_gpg_result
-
-- debug:
-    var: debian_installer_gpg_result.stderr_lines
-
-- name: extract checksum file hash from Release file
-  command: grep -E "^ [0-9a-z]{64} .* main/installer-{{ debian_installer_arch }}/current/{{ [debian_installer_distro, debian_installer_codename] | di_images_path }}/SHA256SUMS$" "{{ installer_path }}/{{ debian_installer_distro }}-{{ debian_installer_codename }}/{{ debian_installer_arch }}-{{ debian_installer_variant }}/Release"
-  changed_when: false
-  register: debian_installer_inrelease_sha256
-
-- name: download SHA256SUMS
-  get_url:
-    url: "{{ debian_installer_base_url }}/SHA256SUMS"
-    dest: "{{ installer_path }}/{{ debian_installer_distro }}-{{ debian_installer_codename }}/{{ debian_installer_arch }}-{{ debian_installer_variant }}/SHA256SUMS"
-    checksum: "sha256:{{ (debian_installer_inrelease_sha256.stdout | trim).split(' ') | first }}"
-
-- name: extract kernel image hash from SHA256SUMS
-  command: grep -E "^[0-9a-z]{64}\s+(./)?{{ debian_installer_variant_path }}/{{ debian_installer_variant_kernal_image_name }}$" "{{ installer_path }}/{{ debian_installer_distro }}-{{ debian_installer_codename }}/{{ debian_installer_arch }}-{{ debian_installer_variant }}/SHA256SUMS"
-  changed_when: false
-  register: debian_installer_sha256sums_kernel
-
-- name: extract inital ramdisk hash from SHA256SUMS
-  command: grep -E "^[0-9a-z]{64}\s+(./)?{{ debian_installer_variant_path }}/initrd.gz$" "{{ installer_path }}/{{ debian_installer_distro }}-{{ debian_installer_codename }}/{{ debian_installer_arch }}-{{ debian_installer_variant }}/SHA256SUMS"
-  changed_when: false
-  register: debian_installer_sha256sums_initrd
-
-- name: set checksum variables
-  set_fact:
-    debian_installer_kernel_checksum: "sha256:{{ debian_installer_sha256sums_kernel.stdout.split(' ') | first }}"
-    debian_installer_initrd_checksum: "sha256:{{ debian_installer_sha256sums_initrd.stdout.split(' ') | first }}"
diff --git a/roles/installer/debian/base/tasks/verify-ubuntu.yml b/roles/installer/debian/base/tasks/verify-ubuntu.yml
deleted file mode 100644
index f2b75492..00000000
--- a/roles/installer/debian/base/tasks/verify-ubuntu.yml
+++ /dev/null
@@ -1,35 +0,0 @@
----
-- name: download SHA256SUMS and signature file
-  loop:
-    - SHA256SUMS
-    - SHA256SUMS.gpg
-  get_url:
-    url: "{{ debian_installer_base_url }}/{{ item }}"
-    dest: "{{ installer_path }}/{{ debian_installer_distro }}-{{ debian_installer_codename }}/{{ debian_installer_arch }}-{{ debian_installer_variant }}/{{ item }}"
-
-- name: verfiy signature of SHA256SUMS.gpg file
-  command: >-
-    gpg --no-options --trust-model always --no-default-keyring  --secret-keyring /dev/null
-        --keyring "{{ global_files_dir }}/common/keyrings/ubuntu-archive.gpg"
-        --verify "{{ installer_path }}/{{ debian_installer_distro }}-{{ debian_installer_codename }}/{{ debian_installer_arch }}-{{ debian_installer_variant }}/SHA256SUMS.gpg"
-        "{{ installer_path }}/{{ debian_installer_distro }}-{{ debian_installer_codename }}/{{ debian_installer_arch }}-{{ debian_installer_variant }}/SHA256SUMS"
-  changed_when: False
-  register: debian_installer_gpg_result
-
-- debug:
-    var: debian_installer_gpg_result.stderr_lines
-
-- name: extract kernel image hash from SHA256SUMS
-  command: grep -E "^[0-9a-z]{64}\s+(./)?{{ debian_installer_variant_path }}/{{ debian_installer_variant_kernal_image_name }}$" "{{ installer_path }}/{{ debian_installer_distro }}-{{ debian_installer_codename }}/{{ debian_installer_arch }}-{{ debian_installer_variant }}/SHA256SUMS"
-  changed_when: false
-  register: debian_installer_sha256sums_kernel
-
-- name: extract inital ramdisk hash from SHA256SUMS
-  command: grep -E "^[0-9a-z]{64}\s+(./)?{{ debian_installer_variant_path }}/initrd.gz$" "{{ installer_path }}/{{ debian_installer_distro }}-{{ debian_installer_codename }}/{{ debian_installer_arch }}-{{ debian_installer_variant }}/SHA256SUMS"
-  changed_when: false
-  register: debian_installer_sha256sums_initrd
-
-- name: set checksum variables
-  set_fact:
-    debian_installer_kernel_checksum: "sha256:{{ debian_installer_sha256sums_kernel.stdout.split(' ') | first }}"
-    debian_installer_initrd_checksum: "sha256:{{ debian_installer_sha256sums_initrd.stdout.split(' ') | first }}"