summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--inventory/host_vars/glt-helene.yml64
-rw-r--r--inventory/host_vars/glt-thetys.yml69
-rw-r--r--spreadspace/glt-helene.yml32
-rw-r--r--spreadspace/glt-thetys.yml34
4 files changed, 13 insertions, 186 deletions
diff --git a/inventory/host_vars/glt-helene.yml b/inventory/host_vars/glt-helene.yml
index 3f021161..7623debd 100644
--- a/inventory/host_vars/glt-helene.yml
+++ b/inventory/host_vars/glt-helene.yml
@@ -1,20 +1,21 @@
---
-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_S346NB0J803346
kernel_cmdline:
- "consoleblank=0"
- - "nomodeset"
+ - "drm.edid_firmware=edid/1280x1024.bin"
network:
- nameservers: "{{ network_zones.r3_lan.dns }}"
- domain: "{{ host_domain }}"
+ nameservers:
+ - 1.1.1.1
+ 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.24/24
+ gateway: 192.168.28.254
interfaces:
- *_network_primary_
@@ -23,54 +24,3 @@ apt_repo_components:
- main
- contrib
- non-free ## for microcode updates
-
-spreadspace_apt_repo_components:
- - container
-
-
-blackmagic_desktopvideo_version: 11.7a12
-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-glt21s2
-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 SDI 4K']
-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/glt21s2?auth={{ vault_streamer_rtmp_forward_keys.c3voc.glt21s2 }}"
- level: full
diff --git a/inventory/host_vars/glt-thetys.yml b/inventory/host_vars/glt-thetys.yml
index 43a3fc11..1b0e582f 100644
--- a/inventory/host_vars/glt-thetys.yml
+++ b/inventory/host_vars/glt-thetys.yml
@@ -1,6 +1,5 @@
---
-system_lvm_volume_size_root: 3G
-
+system_lvm_volume_size_root: 5G
install:
efi: true
disks:
@@ -9,12 +8,13 @@ install:
- "consoleblank=0"
network:
- nameservers: "{{ network_zones.r3_lan.dns }}"
- domain: "{{ host_domain }}"
+ nameservers:
+ - 1.1.1.1
+ 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.22/24
+ gateway: 192.168.28.254
interfaces:
- *_network_primary_
@@ -23,60 +23,3 @@ apt_repo_components:
- main
- contrib
- non-free ## for microcode updates
-
-spreadspace_apt_repo_components:
- - container
-
-
-lvm_groups:
- storage:
- pvs:
- - /dev/disk/by-id/ata-WDC_WD5000LPVX-22V0TT0_WD-WX81AB371127-part1
-
-
-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: 10G
- fs: ext4
-
-kubelet_storage:
- type: lvm
- vg: "{{ host_name }}"
- lv: kubelet
- size: 5G
- 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: storage
- lv: streamer
- size: 400G
- fs: ext4
-streamer_rtmp_base_path: /srv/streamer
-streamer_rtmp_inst_name: feed-glt21s3
-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', '-video_input', 'sdi', '-format_code', 'Hp25', '-ac', '2', '-i', 'DeckLink Mini Recorder']
-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/glt21s3?auth={{ vault_streamer_rtmp_forward_keys.c3voc.glt21s3 }}"
- level: full
diff --git a/spreadspace/glt-helene.yml b/spreadspace/glt-helene.yml
index 516eaae7..7f24aa04 100644
--- a/spreadspace/glt-helene.yml
+++ b/spreadspace/glt-helene.yml
@@ -8,35 +8,3 @@
- role: core/zsh
- role: core/ntp
- role: core/cpu-microcode
- - role: apt-repo/spreadspace
- - role: streaming/blackmagic/desktopvideo
- - role: kubernetes/base
- - role: kubernetes/standalone/base
- - role: streaming/streamer/rtmp
- post_tasks:
- - name: install lm-sensors and i7z
- apt:
- name:
- - lm-sensors
- - i7z
-
- - name: load modules for lm-sensors
- vars:
- sensors_modules:
- - coretemp
- block:
- - name: load special modules for lm-sensors
- loop: "{{ sensors_modules }}"
- modprobe:
- name: "{{ item }}"
- state: present
-
- - name: make sure sensor modules are loaded on reboot
- copy:
- content: |
- # Ansible managed
-
- {% for module in sensors_modules %}
- {{ module }}
- {% endfor %}
- dest: /etc/modules-load.d/sensors.conf
diff --git a/spreadspace/glt-thetys.yml b/spreadspace/glt-thetys.yml
index 0193ed6e..16b667e8 100644
--- a/spreadspace/glt-thetys.yml
+++ b/spreadspace/glt-thetys.yml
@@ -8,37 +8,3 @@
- role: core/zsh
- role: core/ntp
- role: core/cpu-microcode
- - role: storage/lvm/groups
- - role: apt-repo/spreadspace
- - role: streaming/blackmagic/desktopvideo
- - role: kubernetes/base
- - role: kubernetes/standalone/base
- - role: streaming/streamer/rtmp
- post_tasks:
- - name: install lm-sensors and i7z
- apt:
- name:
- - lm-sensors
- - i7z
-
- - name: load modules for lm-sensors
- vars:
- sensors_modules:
- - coretemp
- - it87
- block:
- - name: load special modules for lm-sensors
- loop: "{{ sensors_modules }}"
- modprobe:
- name: "{{ item }}"
- state: present
-
- - name: make sure sensor modules are loaded on reboot
- copy:
- content: |
- # Ansible managed
-
- {% for module in sensors_modules %}
- {{ module }}
- {% endfor %}
- dest: /etc/modules-load.d/sensors.conf
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-03 09:46:44 +0000