From afbabc30a7e3e2269cb5e2fa4438e36c6523779e Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Tue, 28 Mar 2023 23:45:56 +0200 Subject: linuxtage: some more cleanups and add telesto and dione --- inventory/group_vars/glt-c3voc/vars.yml | 2 + inventory/host_vars/glt-dione.yml | 67 ++++-------------------------- inventory/host_vars/glt-helene.yml | 8 +--- inventory/host_vars/glt-telesto.yml | 73 ++++----------------------------- inventory/host_vars/glt-thetys.yml | 8 +--- inventory/hosts.ini | 6 ++- 6 files changed, 22 insertions(+), 142 deletions(-) (limited to 'inventory') diff --git a/inventory/group_vars/glt-c3voc/vars.yml b/inventory/group_vars/glt-c3voc/vars.yml index 9a0239d9..4b04712e 100644 --- a/inventory/group_vars/glt-c3voc/vars.yml +++ b/inventory/group_vars/glt-c3voc/vars.yml @@ -7,3 +7,5 @@ ssh_users_root: sshd_allowusers_group: - voc + +base_modules_blacklist: "{{ base_modules_blacklist_none }}" diff --git a/inventory/host_vars/glt-dione.yml b/inventory/host_vars/glt-dione.yml index 22979b43..58f442a0 100644 --- a/inventory/host_vars/glt-dione.yml +++ b/inventory/host_vars/glt-dione.yml @@ -1,76 +1,23 @@ --- -system_lvm_volume_size_root: 3G +system_lvm_volume_size_root: 5G install: efi: true disks: primary: /dev/disk/by-id/nvme-SAMSUNG_MZVPW256HEGL-00000_S346NY0HC29501 kernel_cmdline: - "consoleblank=0" - - "nomodeset" + - "drm.edid_firmware=edid/1280x1024.bin" network: - nameservers: "{{ network_zones.r3_lan.dns }}" + nameservers: + - 1.1.1.1 domain: "{{ host_domain }}" primary: &_network_primary_ name: eno1 - address: "{{ network_zones.r3_lan.prefix | ansible.utils.ipaddr(network_zones.r3_lan.offsets[inventory_hostname]) }}" - gateway: "{{ network_zones.r3_lan.prefix | ansible.utils.ipaddr(network_zones.r3_lan.offsets['glt-gw-r3']) | ansible.utils.ipaddr('address') }}" + address: 192.168.28.23/24 + gateway: 192.168.28.254 interfaces: - *_network_primary_ -apt_repo_components: - - main - - contrib - - non-free ## for microcode updates - -spreadspace_apt_repo_components: - - container - - -blackmagic_desktopvideo_version: 12.2.2a6 -blackmagic_desktopvideo_include_gui: yes - -docker_pkg_provider: docker-com - -docker_storage: - type: lvm - vg: "{{ host_name }}" - lv: docker - size: 15G - fs: ext4 - -kubelet_storage: - type: lvm - vg: "{{ host_name }}" - lv: kubelet - size: 10G - fs: ext4 - -kubernetes_version: 1.22.5 -kubernetes_container_runtime: docker -kubernetes_standalone_max_pods: 42 -kubernetes_standalone_cni_variant: with-portmap - - -streamer_rtmp_storage: - type: lvm - vg: "{{ host_name }}" - lv: streamer - size: 200G - fs: ext4 -streamer_rtmp_base_path: /srv/streamer -streamer_rtmp_inst_name: feed-glt21s1 -streamer_rtmp_nginx_image_version: 2022-06-12.26 -streamer_rtmp_ffmpeg_image_version: bullseye-decklink11.7-2022-06-12.26 -streamer_rtmp_input: ['-f', 'decklink', '-format_code', 'Hp25', '-ac', '2', '-i', 'DeckLink 8K Pro (1)'] -streamer_rtmp_video_filter_common: "colorspace=iall=bt709:irange=tv:all=bt709:range=tv:format=yuv420p" - -streamer_rtmp_recording: - level: full - segment_size: 3600 - segment_clocktime_offset: 3300 -streamer_rtmp_forwards: - c3voc: - url: "rtmp://ingest.c3voc.de/stream/glt21s1?auth={{ vault_streamer_rtmp_forward_keys.c3voc.glt21s1 }}" - level: full +c3voc_video_disk: /dev/disk/by-id/ata-WDC_WD40EFAX-68JH4N1_WD-WX92DA1LZA99 diff --git a/inventory/host_vars/glt-helene.yml b/inventory/host_vars/glt-helene.yml index bc734a19..71ababaa 100644 --- a/inventory/host_vars/glt-helene.yml +++ b/inventory/host_vars/glt-helene.yml @@ -11,7 +11,7 @@ install: network: nameservers: - 1.1.1.1 - domain: "" + domain: "{{ host_domain }}" primary: &_network_primary_ name: eno1 address: 192.168.28.24/24 @@ -20,10 +20,4 @@ network: - *_network_primary_ -apt_repo_components: - - main - - contrib - - non-free ## for microcode updates - - c3voc_video_disk: /dev/disk/by-id/ata-WDC_WD30EFRX-68EUZN0_WD-WCC4N6ZP3KFJ diff --git a/inventory/host_vars/glt-telesto.yml b/inventory/host_vars/glt-telesto.yml index e132e5da..16b5cce8 100644 --- a/inventory/host_vars/glt-telesto.yml +++ b/inventory/host_vars/glt-telesto.yml @@ -1,77 +1,18 @@ --- -system_lvm_volume_size_root: 3G - +system_lvm_volume_size_root: 5G install: efi: true disks: - primary: /dev/disk/by-id/ata-? - kernel_cmdline: - - "consoleblank=0" - - "nomodeset" + primary: /dev/disk/by-id/nvme-Samsung_SSD_970_PRO_512GB_S5JYNC0N310329Z network: - nameservers: "{{ network_zones.r3_lan.dns }}" + nameservers: + - 1.1.1.1 domain: "{{ host_domain }}" primary: &_network_primary_ - name: eno1 - address: "{{ network_zones.r3_lan.prefix | ansible.utils.ipaddr(network_zones.r3_lan.offsets[inventory_hostname]) }}" - gateway: "{{ network_zones.r3_lan.prefix | ansible.utils.ipaddr(network_zones.r3_lan.offsets['glt-gw-r3']) | ansible.utils.ipaddr('address') }}" + name: enp35s0 + address: 192.168.28.20/24 + gateway: 192.168.28.254 interfaces: - *_network_primary_ - -apt_repo_components: - - main - - contrib - - non-free ## for microcode updates - -spreadspace_apt_repo_components: - - container - -zfs_arc_size: - min: 1GB - max: 2GB - -zfs_pools: - storage: - mountpoint: /srv/storage - create_vdevs: mirror /dev/disk/by-id/ata-SAMSUNG_HD103UJ_S1PVJDWQ720808 /dev/disk/by-id/ata-SAMSUNG_HD103UJ_S1PVJDWQ720810 - - -blackmagic_desktopvideo_version: 12.2.2a6 -blackmagic_desktopvideo_include_gui: yes - - -docker_pkg_provider: docker-com -docker_storage: - type: lvm - vg: "{{ host_name }}" - lv: docker - size: 15G - fs: ext4 - -kubelet_storage: - type: lvm - vg: "{{ host_name }}" - lv: kubelet - size: 10G - fs: ext4 - -kubernetes_version: 1.22.5 -kubernetes_container_runtime: docker -kubernetes_standalone_max_pods: 42 -kubernetes_standalone_cni_variant: with-portmap - - -recorder_storage: - type: zfs - pool: storage - name: recorder -recorder_base_path: /srv/storage/recorder -recorder_inst_name: feed-glt21s2 -recorder_ffmpeg_image_version: bullseye-decklink11.7-2022-06-12.26 -recorder_input: ['-f', 'decklink', '-video_input', 'sdi', '-format_code', 'Hp25', '-ac', '2', '-i', 'DeckLink SDI'] -recorder_video_filter_common: "colorspace=iall=bt709:irange=tv:all=bt709:range=tv" - -recorder_segment_time: 3600 -recorder_segment_clocktime_offset: 3300 diff --git a/inventory/host_vars/glt-thetys.yml b/inventory/host_vars/glt-thetys.yml index 1b0e582f..a04d056e 100644 --- a/inventory/host_vars/glt-thetys.yml +++ b/inventory/host_vars/glt-thetys.yml @@ -10,16 +10,10 @@ install: network: nameservers: - 1.1.1.1 - domain: "" + domain: "{{ host_domain }}" primary: &_network_primary_ name: eno1 address: 192.168.28.22/24 gateway: 192.168.28.254 interfaces: - *_network_primary_ - - -apt_repo_components: - - main - - contrib - - non-free ## for microcode updates diff --git a/inventory/hosts.ini b/inventory/hosts.ini index ae0e208f..fa731e8f 100644 --- a/inventory/hosts.ini +++ b/inventory/hosts.ini @@ -155,10 +155,10 @@ glt-stream host_name=stream [glt-live-r3] glt-gw-r3 host_name=gw-r3 -glt-dione host_name=dione +#glt-dione host_name=dione #glt-helene host_name=helene glt-calypso host_name=calypso -glt-telesto host_name=telesto +#glt-telesto host_name=telesto glt-tsdatacop host_name=tsdatacop #glt-thetys host_name=thetys @@ -174,6 +174,8 @@ ansible_port=22 [glt-c3voc] glt-helene host_name=encoder-glt glt-thetys host_name=mixer-glt +glt-dione host_name=minion-glt1 +glt-telesto host_name=minion-glt2 -- cgit v1.2.3