initial support for ubuntu 24.04

9 files changed, 43 insertions, 20 deletions

diff --git a/spreadspace/s2-chromebook.yml b/chaos-at-home/ch-chromebook.yml
index 972fbbc4..8f13ef17 100644
--- a/spreadspace/s2-chromebook.yml
+++ b/chaos-at-home/ch-chromebook.yml
@@ -1,6 +1,6 @@
 ---
 - name: Basic Setup
-  hosts: s2-chromebook
+  hosts: ch-chromebook
   roles:
   - role: apt-repo/base
   - role: core/base
@@ -9,18 +9,14 @@
   - role: core/cpu-microcode
 
 - name: Payload Setup
-  hosts: s2-chromebook
+  hosts: ch-chromebook
   roles:
-  - role: apt-repo/backports
   - role: ws/base
   - role: core/users
-  - role: ws/minet
-  - role: ws/pipewire
   - role: ws/flatpak
+  - role: ws/minet
   post_tasks:
-  - name: remove install netplan config
+  - name: remove installer netplan config
     file:
-      path: /etc/netplan/00-installer-config.yaml
+      path: /etc/netplan/50-cloud-init.yaml
       state: absent
-
-## https://docs.chrultrabook.com/docs/installing/installing-linux.html
diff --git a/chaos-at-home/ch-prometheus.yml b/chaos-at-home/ch-prometheus.yml
index d7dc2e87..d0d4b586 100644
--- a/chaos-at-home/ch-prometheus.yml
+++ b/chaos-at-home/ch-prometheus.yml
@@ -21,6 +21,7 @@
   - role: vm/host/base
   - role: vm/host/network
   - role: installer/debian/base
+  - role: installer/ubuntu/base
   - role: installer/openbsd/base
   tasks:
   - name: install post-boot script
diff --git a/inventory/group_vars/chaos-at-home/network.yml b/inventory/group_vars/chaos-at-home/network.yml
index 93c0d2d2..9c3fd475 100644
--- a/inventory/group_vars/chaos-at-home/network.yml
+++ b/inventory/group_vars/chaos-at-home/network.yml
@@ -14,6 +14,7 @@ network_zones:
     offsets:
       ch-equinox-ws: 1
       ch-octopi: 8
+      ch-chromebook: 9
       ch-mclr: 10
       ch-mcbr: 11
       ch-turingpi: 19 # remove once BMC firmware can configure the built-in switch
diff --git a/inventory/host_vars/s2-chromebook.yml b/inventory/host_vars/ch-chromebook.yml
index 96e7ab30..bf93cba1 100644
--- a/inventory/host_vars/s2-chromebook.yml
+++ b/inventory/host_vars/ch-chromebook.yml
@@ -5,7 +5,6 @@ ubuntu_autoinstall_keyboard_variant: nodeadkeys
 ubuntu_autoinstall_timezone: Europe/Vienna
 
 ubuntu_autoinstall_desktop: xubuntu
-ubuntu_autoinstall_kernel_image: linux-generic-hwe-22.04-edge
 
 install:
   efi: yes
@@ -33,17 +32,14 @@ install:
   - quiet
   - splash
   - iommu=pt
-  #- nomodeset ## only needed during installation
 
 network:
-  nameservers:
-  - 195.58.161.123
-  - 212.186.211.21
+  nameservers: "{{ network_zones.lan.dns }}"
   domain: "{{ host_domain }}"
   primary: &_network_primary_
     name: enx68da73a8dc5f
-    address: "192.168.28.32/24"
-    gateway: "192.168.28.254"
+    address: "{{ network_zones.lan.prefix | ansible.utils.ipaddr(network_zones.lan.offsets[inventory_hostname]) }}"
+    gateway: "{{ network_zones.lan.gateway }}"
   interfaces:
   - *_network_primary_
 
@@ -78,5 +74,13 @@ ws_base_extra_packages:
   - xfce4-goodies
 
 
+ws_flatpak_apps:
+  - name: org.pipewire.Helvum
+    link: helvum
+
+
+ws_minet_wired_interface_name: enx68da73a8dc5f
+ws_minet_wired_interface_module: cdc_ether
+
 ws_minet_wireless_interface_name: wlp1s0
 ws_minet_wireless_interface_module: iwlwifi
diff --git a/inventory/hosts.ini b/inventory/hosts.ini
index 4b63a684..de125e83 100644
--- a/inventory/hosts.ini
+++ b/inventory/hosts.ini
@@ -23,6 +23,7 @@ ch-nic host_name=nic
 ch-gw-c3voc host_name=gw-c3voc
 ch-equinox-ws host_name=equinox-ws
 ch-equinox-t450s host_name=equinox-t450s
+ch-chromebook host_name=chromebook
 ch-prometheus host_name=prometheus
 ch-apps host_name=apps
 ch-http-proxy host_name=http-proxy
@@ -139,7 +140,6 @@ env_group=spreadspace
 s2-build host_name=build
 s2-thetys host_name=thetys
 s2-mr-snuggles host_name=mr-snuggles
-s2-chromebook host_name=chromebook
 
 
 [linuxtage:vars]
diff --git a/roles/apt-repo/base/tasks/main.yml b/roles/apt-repo/base/tasks/main.yml
index 0b127272..132f7702 100644
--- a/roles/apt-repo/base/tasks/main.yml
+++ b/roles/apt-repo/base/tasks/main.yml
@@ -26,3 +26,11 @@
   file:
     path: /etc/apt/apt.conf.d/20apt-esm-hook.conf
     state: absent
+
+- name: remove new-style ubuntu apt source entries
+  loop:
+  - ubuntu.sources
+  - ubuntu.sources.curtin.orig
+  file:
+    path: "/etc/apt/sources.list.d/{{ item }}"
+    state: absent
diff --git a/roles/ws/base/defaults/main.yml b/roles/ws/base/defaults/main.yml
index 883e06a4..69c10f10 100644
--- a/roles/ws/base/defaults/main.yml
+++ b/roles/ws/base/defaults/main.yml
@@ -22,6 +22,7 @@ ws_base_superflous_packages:
   - unattended-upgrades
 
 ws_base_extra_packages: []
+ws_base_extra_snaps: []
 
 
 ### mind that lightdm is case sensitive when it comes to booleans
diff --git a/roles/ws/base/tasks/main.yml b/roles/ws/base/tasks/main.yml
index e1a81103..23067abd 100644
--- a/roles/ws/base/tasks/main.yml
+++ b/roles/ws/base/tasks/main.yml
@@ -59,11 +59,11 @@
     - exfatprogs
     state: present
 
-- name: install browser
-  apt:
+- name: install chromium and firefox via snap
+  snap:
     name:
     - firefox
-    - chromium-browser
+    - chromium
     state: present
 
 - name: install multimedia stuff
@@ -104,5 +104,10 @@
     name: "{{ ws_base_extra_packages }}"
     state: present
 
+- name: install extra snaps
+  snap:
+    name: "{{ ws_base_extra_snaps }}"
+    state: present
+
 - name: configure lightdm
   import_tasks: lightdm.yml
diff --git a/roles/ws/minet/tasks/main.yml b/roles/ws/minet/tasks/main.yml
index 35eafa17..269220b0 100644
--- a/roles/ws/minet/tasks/main.yml
+++ b/roles/ws/minet/tasks/main.yml
@@ -67,6 +67,13 @@
     state: stopped
     masked: yes
 
+- name: make sure dhclient and wpa_supplicant is installed
+  apt:
+    name:
+    - isc-dhcp-client
+    - wpasupplicant
+    state: present
+
 - name: create resolvconf symlink to resolvectl
   file:
     src: /usr/bin/resolvectl