fix debian buster keyring, disable multi-arch on ubuntu

6 files changed, 14 insertions, 3 deletions

diff --git a/roles/installer/debian/fetch/tasks/main.yml b/roles/installer/debian/fetch/tasks/main.yml
index 0e756411..b0dd59a5 100644
--- a/roles/installer/debian/fetch/tasks/main.yml
+++ b/roles/installer/debian/fetch/tasks/main.yml
@@ -7,7 +7,7 @@
 - name: download and verify installer files
   block:
   - name: fetch and verify installer checksum file
-    include_tasks: "verify-{{ install_distro }}.yml"
+    include_tasks: "verify-{{ debian_installer_distro }}.yml"
 
   - name: extract file hashes from SHA256SUMS
     loop: "{{ debian_installer_variant_files }}"
@@ -23,7 +23,6 @@
       url: "{{ debian_installer_base_url }}/{{ debian_installer_variant_path }}/{{ item.item }}"
       dest: "{{ debian_installer_target_dir }}/{{ item.item }}"
       checksum: "sha256:{{ item.stdout.split(' ') | first }}"
-      force: "{{ debian_installer_force_download }}"
       mode: 0644
 
   rescue:
diff --git a/roles/installer/debian/fetch/tasks/verify-debian.yml b/roles/installer/debian/fetch/tasks/verify-debian.yml
index 917421bc..fbc28676 100644
--- a/roles/installer/debian/fetch/tasks/verify-debian.yml
+++ b/roles/installer/debian/fetch/tasks/verify-debian.yml
@@ -10,7 +10,7 @@
 
 - name: verfiy signature of Release file
   command: >-
-    gpgv --keyring "{{ installer_keyrings_path | default(installer_base_path+'/keyrings') }}/debian-{{ install_codename }}.gpg"
+    gpgv --keyring "{{ installer_keyrings_path | default(installer_base_path+'/keyrings') }}/debian-{{ debian_installer_codename }}.gpg"
         "{{ debian_installer_target_dir }}/Release.gpg" "{{ debian_installer_target_dir }}/Release"
   changed_when: False
   register: debian_installer_gpg_result
diff --git a/roles/installer/debian/preseed/templates/preseed_ubuntu-bionic.cfg.j2 b/roles/installer/debian/preseed/templates/preseed_ubuntu-bionic.cfg.j2
index c2863382..4619881d 100644
--- a/roles/installer/debian/preseed/templates/preseed_ubuntu-bionic.cfg.j2
+++ b/roles/installer/debian/preseed/templates/preseed_ubuntu-bionic.cfg.j2
@@ -59,6 +59,9 @@ d-i clock-setup/ntp boolean false
 
 d-i base-installer/install-recommends boolean false
 d-i apt-setup/security_host string {{ apt_repo_providers[hostvars[install_hostname].apt_repo_provider].ubuntu }}
+{% if hostvars[install_hostname].install_cooked.arch | default('amd64') == 'amd64' %}
+d-i apt-setup/multiarch string amd64
+{% endif %}
 
 tasksel tasksel/first multiselect
 d-i pkgsel/include string openssh-server {{ hostvars[install_hostname].python_basename }} {{ hostvars[install_hostname].python_basename }}-apt ifupdown
diff --git a/roles/installer/debian/preseed/templates/preseed_ubuntu-focal.cfg.j2 b/roles/installer/debian/preseed/templates/preseed_ubuntu-focal.cfg.j2
index 997617c1..20532934 100644
--- a/roles/installer/debian/preseed/templates/preseed_ubuntu-focal.cfg.j2
+++ b/roles/installer/debian/preseed/templates/preseed_ubuntu-focal.cfg.j2
@@ -59,6 +59,9 @@ d-i clock-setup/ntp boolean false
 
 d-i base-installer/install-recommends boolean false
 d-i apt-setup/security_host string {{ apt_repo_providers[hostvars[install_hostname].apt_repo_provider].ubuntu }}
+{% if hostvars[install_hostname].install_cooked.arch | default('amd64') == 'amd64' %}
+d-i apt-setup/multiarch string amd64
+{% endif %}
 
 tasksel tasksel/first multiselect
 d-i pkgsel/include string openssh-server {{ hostvars[install_hostname].python_basename }} {{ hostvars[install_hostname].python_basename }}-apt ifupdown
diff --git a/roles/installer/debian/preseed/templates/preseed_ubuntu-xenial.cfg.j2 b/roles/installer/debian/preseed/templates/preseed_ubuntu-xenial.cfg.j2
index 7144dc4f..62904303 100644
--- a/roles/installer/debian/preseed/templates/preseed_ubuntu-xenial.cfg.j2
+++ b/roles/installer/debian/preseed/templates/preseed_ubuntu-xenial.cfg.j2
@@ -56,6 +56,9 @@ d-i clock-setup/ntp boolean false
 
 d-i base-installer/install-recommends boolean false
 d-i apt-setup/security_host string {{ apt_repo_providers[hostvars[install_hostname].apt_repo_provider].ubuntu }}
+{% if hostvars[install_hostname].install_cooked.arch | default('amd64') == 'amd64' %}
+d-i apt-setup/multiarch string amd64
+{% endif %}
 
 tasksel tasksel/first multiselect
 d-i pkgsel/include string openssh-server {{ hostvars[install_hostname].python_basename }} {{ hostvars[install_hostname].python_basename }}-apt
diff --git a/roles/installer/debian/preseed/templates/preseed_xubuntu-focal-desktop.cfg.j2 b/roles/installer/debian/preseed/templates/preseed_xubuntu-focal-desktop.cfg.j2
index 46403443..5eafb358 100644
--- a/roles/installer/debian/preseed/templates/preseed_xubuntu-focal-desktop.cfg.j2
+++ b/roles/installer/debian/preseed/templates/preseed_xubuntu-focal-desktop.cfg.j2
@@ -62,6 +62,9 @@ d-i clock-setup/ntp boolean false
 
 d-i base-installer/install-recommends boolean false
 d-i apt-setup/security_host string {{ apt_repo_providers[hostvars[install_hostname].apt_repo_provider].ubuntu }}
+{% if hostvars[install_hostname].install_cooked.arch | default('amd64') == 'amd64' %}
+d-i apt-setup/multiarch string amd64
+{% endif %}
 
 tasksel tasksel/first multiselect xubuntu-desktop
 d-i pkgsel/include string openssh-server {{ hostvars[install_hostname].python_basename }} {{ hostvars[install_hostname].python_basename }}-apt ifupdown