From fad9228224fdc07bf0ef7e15a045d8e1e35ea5fe Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Sat, 6 May 2023 17:18:54 +0200 Subject: prepare hosts for k8s-chtest cluster --- chaos-at-home/ch-calypso.yml | 7 ---- chaos-at-home/ch-thetys.yml | 4 --- inventory/host_vars/ch-calypso.yml | 72 ++++++++++---------------------------- inventory/host_vars/ch-thetys.yml | 25 ++----------- inventory/hosts.ini | 4 +-- 5 files changed, 23 insertions(+), 89 deletions(-) diff --git a/chaos-at-home/ch-calypso.yml b/chaos-at-home/ch-calypso.yml index ef85551c..851731de 100644 --- a/chaos-at-home/ch-calypso.yml +++ b/chaos-at-home/ch-calypso.yml @@ -12,13 +12,7 @@ - name: Payload Setup hosts: ch-calypso roles: - - role: storage/zfs/pools - - role: apt-repo/obs-studio - - role: apt-repo/spreadspace - - role: ws/base - - role: core/admin-users - role: streaming/blackmagic/desktopvideo - - role: streaming/blackmagic/mediaexpress post_tasks: - name: install lm-sensors and i7z apt: @@ -30,7 +24,6 @@ vars: sensors_modules: - coretemp - - w83627ehf block: - name: load special modules for lm-sensors loop: "{{ sensors_modules }}" diff --git a/chaos-at-home/ch-thetys.yml b/chaos-at-home/ch-thetys.yml index 27b85f71..748d8781 100644 --- a/chaos-at-home/ch-thetys.yml +++ b/chaos-at-home/ch-thetys.yml @@ -13,10 +13,6 @@ hosts: ch-thetys roles: - role: streaming/blackmagic/desktopvideo - - role: apt-repo/spreadspace - - role: kubernetes/base - - role: kubernetes/standalone/base - - role: streaming/streamer/rtmp post_tasks: - name: install lm-sensors and i7z apt: diff --git a/inventory/host_vars/ch-calypso.yml b/inventory/host_vars/ch-calypso.yml index 163b63e4..c778d76f 100644 --- a/inventory/host_vars/ch-calypso.yml +++ b/inventory/host_vars/ch-calypso.yml @@ -1,34 +1,9 @@ --- -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 - - +system_lvm_volume_size_root: 5G install: efi: yes disks: primary: /dev/disk/by-id/ata-OCZ-VERTEX2_OCZ-5328NA52AN84G246 - 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 network: nameservers: "{{ network_zones.lan.dns }}" @@ -43,38 +18,27 @@ network: apt_repo_components: - main - - restricted - - universe - - multiverse + - contrib + - non-free ## for microcode updates spreadspace_apt_repo_components: - - main - - streaming - -base_modules_blacklist: "{{ base_modules_blacklist_all_but_sound }}" + - container -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: - # needs apt-repo/obs-studio - - obs-studio - -ws_base_lightdm_defaults: - autologin-user: equinox - autologin-user-timeout: 0 +blackmagic_desktopvideo_version: 12.2.2a6 +blackmagic_desktopvideo_include_gui: yes -blackmagic_desktopvideo_version: 11.7a12 -blackmagic_desktopvideo_include_gui: yes +containerd_storage: + type: lvm + vg: "{{ host_name }}" + lv: containerd + size: 7G + fs: ext4 -blackmagic_mediaexpress_version: 3.6.2a2 +kubelet_storage: + type: lvm + vg: "{{ host_name }}" + lv: kubelet + size: 5G + fs: ext4 diff --git a/inventory/host_vars/ch-thetys.yml b/inventory/host_vars/ch-thetys.yml index d34bcdd6..23c38ec7 100644 --- a/inventory/host_vars/ch-thetys.yml +++ b/inventory/host_vars/ch-thetys.yml @@ -31,13 +31,11 @@ blackmagic_desktopvideo_version: 12.2.2a6 blackmagic_desktopvideo_include_gui: yes -docker_pkg_provider: docker-com - -docker_storage: +containerd_storage: type: lvm vg: "{{ host_name }}" - lv: docker - size: 10G + lv: containerd + size: 7G fs: ext4 kubelet_storage: @@ -46,20 +44,3 @@ kubelet_storage: lv: kubelet size: 5G fs: ext4 - -kubernetes_version: 1.27.1 -kubernetes_cri_tools_pkg_version: 1.26.0-00 -kubernetes_container_runtime: docker -kubernetes_standalone_max_pods: 42 -kubernetes_standalone_cni_variant: with-portmap - - -streamer_rtmp_base_path: /srv/streamer -streamer_rtmp_inst_name: feed -streamer_rtmp_nginx_image_version: 2022-07-10.30 -streamer_rtmp_ffmpeg_image_version: bullseye-decklink11.7-2022-07-08.29 -streamer_rtmp_input: ['-f', 'decklink', '-format_code', 'Hp50', '-ac', '2', '-i', 'DeckLink SDI 4K'] -streamer_rtmp_video_filter_common: "colorspace=iall=bt709:irange=tv:all=bt709:range=tv:format=yuv420p" -streamer_rtmp_config: - x264: - preset: faster diff --git a/inventory/hosts.ini b/inventory/hosts.ini index c4d9211b..591d6f49 100644 --- a/inventory/hosts.ini +++ b/inventory/hosts.ini @@ -624,5 +624,5 @@ elevate-mediachannel-lb ### Kubernetes Cluster: chtest [k8s-chtest] ch-k8s-ctrl -ch-dione -ch-helene +ch-thetys +ch-calypso -- cgit v1.2.3