incoporate some hardware changes in telesto and calypso

3 files changed, 77 insertions, 23 deletions

diff --git a/chaos-at-home/ch-calypso.yml b/chaos-at-home/ch-calypso.yml
new file mode 100644
index 00000000..4200e56c
--- /dev/null
+++ b/chaos-at-home/ch-calypso.yml
@@ -0,0 +1,16 @@
+---
+- name: Basic Setup
+  hosts: ch-calypso
+  roles:
+  - role: apt-repo/base
+  - role: core/base
+  - role: core/sshd
+  - role: core/zsh
+  - role: core/cpu-microcode
+  - role: zfs/base
+  - role: apt-repo/spreadspace
+  - role: apt-repo/obs-studio
+  - role: ws/base
+  - role: core/admin-users
+  - role: streaming/blackmagic/desktopvideo
+  - role: streaming/blackmagic/mediaexpress
diff --git a/inventory/host_vars/ch-calypso.yml b/inventory/host_vars/ch-calypso.yml
index d565c6d8..a9e47bfc 100644
--- a/inventory/host_vars/ch-calypso.yml
+++ b/inventory/host_vars/ch-calypso.yml
@@ -1,15 +1,34 @@
 ---
+preseed_language: de
+preseed_country: AT
+preseed_locales:
+  - de_AT.UTF-8
+  - de_DE.UTF-8
+  - en_US.UTF-8
+
+preseed_no_splash: no
+preseed_install_tasks:
+  - xubuntu-desktop
+
+
 install:
   efi: yes
   disks:
-    primary: software-raid
-    raid:
-      level: 1
-      members:
-      - /dev/disk/by-id/ata-SAMSUNG_HD103UJ_S1PVJDWQ720805
-      - /dev/disk/by-id/ata-SAMSUNG_HD103UJ_S1PVJDWQ720811
+    primary: "/dev/disk/by-id/ata-Samsung_SSD_840_PRO_Series_S1ATNSAD703481A"
   system_lvm:
-    size: 20G
+    volumes:
+    - name: root
+      size: 20G
+      filesystem: ext4
+      mountpoint: /
+    - name: var+log
+      size: 768M
+      filesystem: ext4
+      mountpoint: /var/log
+      mount_options:
+      - noatime
+      - nodev
+      - noexec
 
 network:
   nameservers: "{{ network_zones.lan.dns }}"
@@ -20,3 +39,33 @@ network:
     gateway: "{{ network_zones.lan.gateway }}"
   interfaces:
   - *_network_primary_
+
+
+apt_repo_components:
+  - main
+  - restricted
+  - universe
+  - multiverse
+
+base_modules_blacklist: "{{ base_modules_blacklist_all_but_sound }}"
+
+admin_users_host:
+  - equinox
+
+zfs_arc_size:
+  min: 1GB
+  max: 2GB
+
+zfs_pools:
+  storage:
+    mountpoint: /srv/storage
+    create_vdevs: mirror /dev/disk/by-id/ata-SAMSUNG_HD103UJ_S1PVJDWQ720805 /dev/disk/by-id/ata-SAMSUNG_HD103UJ_S1PVJDWQ720811
+
+ws_base_extra_packages:
+  - obs-studio
+
+
+blackmagic_desktopvideo_version: 11.1a11
+blackmagic_desktopvideo_include_gui: yes
+
+blackmagic_mediaexpress_version: 3.5.9a10
diff --git a/inventory/host_vars/ch-telesto.yml b/inventory/host_vars/ch-telesto.yml
index e9288ba7..69165892 100644
--- a/inventory/host_vars/ch-telesto.yml
+++ b/inventory/host_vars/ch-telesto.yml
@@ -14,14 +14,8 @@ preseed_install_tasks:
 install:
   efi: yes
   disks:
-    primary: software-raid
-    raid:
-      level: 1
-      members:
-      - /dev/disk/by-id/ata-SAMSUNG_HD103UJ_S1PVJDWQ720808
-      - /dev/disk/by-id/ata-SAMSUNG_HD103UJ_S1PVJDWQ720810
+    primary: "/dev/disk/by-id/ata-OCZ-VERTEX2_OCZ-5328NA52AN84G246"
   system_lvm:
-    size: 50G
     volumes:
     - name: root
       size: 20G
@@ -65,18 +59,13 @@ zfs_arc_size:
 zfs_pools:
   storage:
     mountpoint: /srv/storage
-    create_vdevs: mirror /dev/disk/by-id/ata-SAMSUNG_HD103UJ_S1PVJDWQ720808-part4 /dev/disk/by-id/ata-SAMSUNG_HD103UJ_S1PVJDWQ720810-part4
-
-ws_base_home_zfs:
-  pool: storage
-  name: home
-  properties:
-    xattr: sa
-    compression: lz4
-    quota: 100G
+    create_vdevs: mirror /dev/disk/by-id/ata-SAMSUNG_HD103UJ_S1PVJDWQ720808 /dev/disk/by-id/ata-SAMSUNG_HD103UJ_S1PVJDWQ720810
 
 ws_base_extra_packages:
   - obs-studio
 
 
+blackmagic_desktopvideo_version: 11.1a11
 blackmagic_desktopvideo_include_gui: yes
+
+blackmagic_mediaexpress_version: 3.5.9a10