ele-hpws-mini(1,2): prepare for e24

2 files changed, 35 insertions, 54 deletions

diff --git a/inventory/host_vars/ele-hpws-mini1.yml b/inventory/host_vars/ele-hpws-mini1.yml
index 207414f4..8d09f6da 100644
--- a/inventory/host_vars/ele-hpws-mini1.yml
+++ b/inventory/host_vars/ele-hpws-mini1.yml
@@ -1,16 +1,4 @@
 ---
-debian_preseed_language: de
-debian_preseed_country: AT
-debian_preseed_locales:
-  - de_AT.UTF-8
-  - de_DE.UTF-8
-  - en_US.UTF-8
-
-debian_preseed_no_splash: no
-debian_preseed_install_tasks:
-  - xubuntu-desktop
-
-
 install:
   efi: yes
   disks:
@@ -37,41 +25,30 @@ install:
     - "consoleblank=0"
 
 network:
-  nameservers: "{{ network_zones.emc.dns }}"
+  nameservers: "{{ network_zones.lan.dns }}"
   domain: "{{ host_domain }}"
   primary: &_network_primary_
     name: eno1
-    address: "{{ network_zones.emc.prefix | ansible.utils.ipaddr(network_zones.emc.offsets[inventory_hostname]) }}"
-    gateway: "{{ network_zones.emc.gateway }}"
+    address: "{{ network_zones.lan.prefix | ansible.utils.ipaddr(network_zones.lan.offsets[inventory_hostname]) }}"
+    gateway: "{{ network_zones.lan.gateway }}"
   interfaces:
   - *_network_primary_
-  - name: eno1.18
-    address: "{{ network_zones.lan.prefix | ansible.utils.ipaddr(network_zones.lan.offsets[inventory_hostname]) }}"
-
 
-apt_repo_components:
-  - main
-  - restricted
-  - universe
-  - multiverse
 
 base_modules_blacklist: "{{ base_modules_blacklist_all_but_sound }}"
 
-ssh_users_root:
-  - equinox
-  - datacop
 
-admin_users_host:
-  - equinox
+browser_kiosk_xinit_commands_extra: |
+  xrandr --output HDMI-1 --mode 1920x1080 --rate 50
 
-ws_base_lightdm_defaults:
-  autologin-user: elevate
-  autologin-user-timeout: 0
+browser_kiosk_asound_conf: |
+  pcm.hdmi0 { type hw; card HDMI; device 3; }
+  ctl.hdmi0 { type hw; card HDMI; device 3; }
+  pcm.analog { type hw; card PCH; }
+  ctl.analog { type hw; card PCH; }
 
-ws_base_xrandr_setup_script: |
-  #!/bin/bash
+  pcm.!default pcm.analog
+  ctl.!default ctl.analog
 
-  xrandr --output DP-1 --mode 1920x1080 --rate 50 --primary
-  xrandr --output HDMI-2 --mode 1920x1080 --rate 25 --right-of DP-1
 
-  exit 0
+browser_kiosk_url: "https://remote.elev8.at/stream-ui/player.html#control={{ hostvars['ele-jitsi'].jitsi_meet_streamui.default_control_room }}&displayName={{ host_name }}"
diff --git a/inventory/host_vars/ele-hpws-mini2.yml b/inventory/host_vars/ele-hpws-mini2.yml
index e8d6bbe2..a8717ecd 100644
--- a/inventory/host_vars/ele-hpws-mini2.yml
+++ b/inventory/host_vars/ele-hpws-mini2.yml
@@ -1,23 +1,15 @@
 ---
-debian_preseed_language: de
-debian_preseed_country: AT
-debian_preseed_locales:
-  - de_AT.UTF-8
-  - de_DE.UTF-8
-  - en_US.UTF-8
+ubuntu_autoinstall_locale: de_AT
+ubuntu_autoinstall_keyboard_layout: de
+ubuntu_autoinstall_keyboard_variant: nodeadkeys
+ubuntu_autoinstall_timezone: Europe/Vienna
 
-debian_preseed_no_splash: no
-debian_preseed_install_tasks:
-  - xubuntu-desktop
-
-
-install_playbook: ele-emcplayer
-install_dhcp: yes
+ubuntu_autoinstall_desktop: xubuntu
 
 install:
   efi: yes
   disks:
-    primary: /dev/disk/by-id/ata-WDC_WDS120G2G0A-00JH30_200854444012
+    primary: /dev/disk/by-id/ata-WDC_WDS120G2G0A-00JH30_200854443001
   system_lvm:
     volumes:
     - name: root
@@ -40,12 +32,12 @@ install:
     - "consoleblank=0"
 
 network:
-  nameservers: "{{ network_zones.guest.dns }}"
+  nameservers: "{{ network_zones.lan.dns }}"
   domain: "{{ host_domain }}"
   primary: &_network_primary_
     name: eno1
-    address: "{{ network_zones.guest.prefix | ansible.utils.ipaddr(network_zones.guest.offsets[inventory_hostname]) }}"
-    gateway: "{{ network_zones.guest.gateway }}"
+    address: "{{ network_zones.lan.prefix | ansible.utils.ipaddr(network_zones.lan.offsets[inventory_hostname]) }}"
+    gateway: "{{ network_zones.lan.gateway }}"
   interfaces:
   - *_network_primary_
 
@@ -56,11 +48,23 @@ apt_repo_components:
   - universe
   - multiverse
 
+
 base_modules_blacklist: "{{ base_modules_blacklist_all_but_sound }}"
 
 admin_users_host:
   - equinox
 
+
+ws_base_extra_packages:
+  - chromium-browser
+
 ws_base_lightdm_defaults:
-  autologin-user: player
+  autologin-user: elevate
   autologin-user-timeout: 0
+
+ws_base_xrandr_setup_script: |
+  #!/bin/bash
+
+  xrandr --output HDMI-1 --mode 1920x1080 --rate 50 --primary
+
+  exit 0