some workarounds and fixes for equinox-ws install to work

5 files changed, 7 insertions, 13 deletions

diff --git a/inventory/host_vars/ch-equinox-ws.yml b/inventory/host_vars/ch-equinox-ws.yml
index 6ab03bdf..24b67350 100644
--- a/inventory/host_vars/ch-equinox-ws.yml
+++ b/inventory/host_vars/ch-equinox-ws.yml
@@ -5,9 +5,6 @@ ubuntu_autoinstall_keyboard_variant: nodeadkeys
 ubuntu_autoinstall_timezone: Europe/Vienna
 
 ubuntu_autoinstall_desktop: xubuntu
-ubuntu_autoinstall_apt_arches:
-  - amd64
-  - i386
 ubuntu_autoinstall_manual_partitioning: yes
 ###
 # mark disk as bootable (EFI System Partition gets created)
@@ -256,7 +253,7 @@ ws_base_extra_packages:
   - spice-client-gtk
   - sqlite3
   - sshfs
-  - steam
+  #- steam-installer
   - stlink-tools
   - stm32flash
   - stress
@@ -283,7 +280,6 @@ ws_base_extra_packages:
   - wakeonlan
   - whois
   - wine
-  - wine32
   - wine64
   - winetricks
   - wireshark
diff --git a/roles/installer/ubuntu/autoinstall/defaults/main.yml b/roles/installer/ubuntu/autoinstall/defaults/main.yml
index 51ac6114..50a35ae1 100644
--- a/roles/installer/ubuntu/autoinstall/defaults/main.yml
+++ b/roles/installer/ubuntu/autoinstall/defaults/main.yml
@@ -39,7 +39,4 @@ ubuntu_autoinstall_system_lvm_volumes_default:
     - noexec
 
 
-ubuntu_autoinstall_apt_arches:
-  - amd64
-
 ubuntu_autoinstall_install_tasks: []
diff --git a/roles/installer/ubuntu/autoinstall/templates/autoinstall.yml.j2 b/roles/installer/ubuntu/autoinstall/templates/autoinstall.yml.j2
index 98d6699b..93b952b6 100644
--- a/roles/installer/ubuntu/autoinstall/templates/autoinstall.yml.j2
+++ b/roles/installer/ubuntu/autoinstall/templates/autoinstall.yml.j2
@@ -203,7 +203,8 @@ autoinstall:
   apt:
     primary:
     - uri: http://{{ apt_repo_providers[apt_repo_provider].ubuntu.host }}{{ apt_repo_providers[apt_repo_provider].ubuntu.path }}
-      arches: {{ ubuntu_autoinstall_apt_arches | to_json}}
+      arches:
+      - amd64
 
   user-data:
     hostname: "{{ host_name }}"
@@ -249,9 +250,7 @@ autoinstall:
   - curtin in-target --target=/target -- sed -e 's/^\(\s*#*\s*Port.*\)/Port {{ ansible_port }}/' -i /etc/ssh/sshd_config
 {% endif %}
   - curtin in-target --target=/target -- apt-get -y -q purge multipath-tools open-vm-tools
-{% if ubuntu_installer_codename != 'focal' %}
   - curtin in-target --target=/target -- apt-get -y -q purge systemd-oomd
-{% endif %}
 {% if ubuntu_autoinstall_desktop is undefined %}
   - curtin in-target --target=/target -- apt-mark manual iputils-ping isc-dhcp-client netcat-openbsd netplan.io sudo
   - curtin in-target --target=/target -- apt-get -y -q purge policykit-1 ubuntu-minimal unattended-upgrades sound-theme-freedesktop thin-provisioning-tools cryptsetup byobu open-iscsi btrfs-progs pollinate lxd-agent-loader
diff --git a/roles/installer/ubuntu/fetch/tasks/main.yml b/roles/installer/ubuntu/fetch/tasks/main.yml
index a4f7f720..ff87fb64 100644
--- a/roles/installer/ubuntu/fetch/tasks/main.yml
+++ b/roles/installer/ubuntu/fetch/tasks/main.yml
@@ -2,6 +2,10 @@
 - when: ubuntu_installer_version is undefined
   include_tasks: determine-latest-version.yml
 
+- name: compute target directory
+  set_fact:
+    ubuntu_installer_target_dir: "{{ installer_base_path }}/{{ ubuntu_installer_codename }}/{{ ubuntu_installer_version }}-{{ ubuntu_installer_variant }}"
+
 - name: prepare directories for installer files
   file:
     name: "{{ ubuntu_installer_target_dir }}"
diff --git a/roles/installer/ubuntu/fetch/vars/main.yml b/roles/installer/ubuntu/fetch/vars/main.yml
deleted file mode 100644
index 29ca94a6..00000000
--- a/roles/installer/ubuntu/fetch/vars/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-ubuntu_installer_target_dir: "{{ installer_base_path }}/{{ ubuntu_installer_codename }}/{{ ubuntu_installer_version }}-{{ ubuntu_installer_variant }}"