From 35d058c2db0ad466a4c73261128806056ebd97b3 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Fri, 26 Apr 2024 21:26:53 +0200
Subject: initial support for ubuntu 24.04

---
 inventory/group_vars/chaos-at-home/network.yml |  1 +
 inventory/host_vars/ch-chromebook.yml          | 86 ++++++++++++++++++++++++++
 inventory/host_vars/s2-chromebook.yml          | 82 ------------------------
 inventory/hosts.ini                            |  2 +-
 4 files changed, 88 insertions(+), 83 deletions(-)
 create mode 100644 inventory/host_vars/ch-chromebook.yml
 delete mode 100644 inventory/host_vars/s2-chromebook.yml

(limited to 'inventory')

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/ch-chromebook.yml b/inventory/host_vars/ch-chromebook.yml
new file mode 100644
index 00000000..bf93cba1
--- /dev/null
+++ b/inventory/host_vars/ch-chromebook.yml
@@ -0,0 +1,86 @@
+---
+ubuntu_autoinstall_locale: de_AT
+ubuntu_autoinstall_keyboard_layout: de
+ubuntu_autoinstall_keyboard_variant: nodeadkeys
+ubuntu_autoinstall_timezone: Europe/Vienna
+
+ubuntu_autoinstall_desktop: xubuntu
+
+install:
+  efi: yes
+  disks:
+    primary: /dev/disk/by-id/nvme-KBG40ZMT128G_TOSHIBA_MEMORY_X0CPG4JGQA71
+  system_lvm:
+    volumes:
+    - name: root
+      size: 20G
+      filesystem: ext4
+      mountpoint: /
+    - name: var+log
+      size: 768M
+      filesystem: ext4
+      mountpoint: /var/log
+      mount_options:
+      - noatime
+      - nodev
+      - noexec
+    - name: home
+      size: 50G
+      filesystem: ext4
+      mountpoint: /home
+  kernel_cmdline:
+  - quiet
+  - splash
+  - iommu=pt
+
+network:
+  nameservers: "{{ network_zones.lan.dns }}"
+  domain: "{{ host_domain }}"
+  primary: &_network_primary_
+    name: enx68da73a8dc5f
+    address: "{{ network_zones.lan.prefix | ansible.utils.ipaddr(network_zones.lan.offsets[inventory_hostname]) }}"
+    gateway: "{{ network_zones.lan.gateway }}"
+  interfaces:
+  - *_network_primary_
+
+base_modules_blacklist: "{{ base_modules_blacklist_none }}"
+
+zsh_banner: equinox
+
+admin_users_host:
+  - equinox
+
+apt_repo_components:
+  - main
+  - restricted
+  - universe
+  - multiverse
+
+
+ws_base_extra_packages:
+  - cpu-x
+  - horst
+  - ipcalc
+  - iperf
+  - iperf3
+  - iputils-arping
+  - jq
+  - mosh
+  - pv
+  - s-tui
+  - unrar
+  - wavemon
+  - whois
+  - 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/host_vars/s2-chromebook.yml b/inventory/host_vars/s2-chromebook.yml
deleted file mode 100644
index 96e7ab30..00000000
--- a/inventory/host_vars/s2-chromebook.yml
+++ /dev/null
@@ -1,82 +0,0 @@
----
-ubuntu_autoinstall_locale: de_AT
-ubuntu_autoinstall_keyboard_layout: de
-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
-  disks:
-    primary: /dev/disk/by-id/nvme-KBG40ZMT128G_TOSHIBA_MEMORY_X0CPG4JGQA71
-  system_lvm:
-    volumes:
-    - name: root
-      size: 20G
-      filesystem: ext4
-      mountpoint: /
-    - name: var+log
-      size: 768M
-      filesystem: ext4
-      mountpoint: /var/log
-      mount_options:
-      - noatime
-      - nodev
-      - noexec
-    - name: home
-      size: 50G
-      filesystem: ext4
-      mountpoint: /home
-  kernel_cmdline:
-  - quiet
-  - splash
-  - iommu=pt
-  #- nomodeset ## only needed during installation
-
-network:
-  nameservers:
-  - 195.58.161.123
-  - 212.186.211.21
-  domain: "{{ host_domain }}"
-  primary: &_network_primary_
-    name: enx68da73a8dc5f
-    address: "192.168.28.32/24"
-    gateway: "192.168.28.254"
-  interfaces:
-  - *_network_primary_
-
-base_modules_blacklist: "{{ base_modules_blacklist_none }}"
-
-zsh_banner: equinox
-
-admin_users_host:
-  - equinox
-
-apt_repo_components:
-  - main
-  - restricted
-  - universe
-  - multiverse
-
-
-ws_base_extra_packages:
-  - cpu-x
-  - horst
-  - ipcalc
-  - iperf
-  - iperf3
-  - iputils-arping
-  - jq
-  - mosh
-  - pv
-  - s-tui
-  - unrar
-  - wavemon
-  - whois
-  - xfce4-goodies
-
-
-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]
-- 
cgit v1.2.3