From 5fefcb795d220be8703fe2a56ff92d30aa0ce079 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Sun, 30 Jul 2023 18:55:11 +0200
Subject: some workarounds and fixes for equinox-ws install to work

---
 roles/installer/ubuntu/autoinstall/defaults/main.yml            | 3 ---
 roles/installer/ubuntu/autoinstall/templates/autoinstall.yml.j2 | 5 ++---
 roles/installer/ubuntu/fetch/tasks/main.yml                     | 4 ++++
 roles/installer/ubuntu/fetch/vars/main.yml                      | 2 --
 4 files changed, 6 insertions(+), 8 deletions(-)
 delete mode 100644 roles/installer/ubuntu/fetch/vars/main.yml

(limited to 'roles')

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 }}"
-- 
cgit v1.2.3