summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--inventory/group_vars/glt-c3voc/vars.yml2
-rw-r--r--inventory/host_vars/glt-dione.yml67
-rw-r--r--inventory/host_vars/glt-helene.yml8
-rw-r--r--inventory/host_vars/glt-telesto.yml73
-rw-r--r--inventory/host_vars/glt-thetys.yml8
-rw-r--r--inventory/hosts.ini6
-rw-r--r--spreadspace/glt-dione.yml40
-rw-r--r--spreadspace/glt-helene.yml3
-rw-r--r--spreadspace/glt-telesto.yml42
-rw-r--r--spreadspace/glt-thetys.yml3
10 files changed, 34 insertions, 218 deletions
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
diff --git a/spreadspace/glt-dione.yml b/spreadspace/glt-dione.yml
index 733ba861..28e0e0dd 100644
--- a/spreadspace/glt-dione.yml
+++ b/spreadspace/glt-dione.yml
@@ -5,38 +5,10 @@
- role: apt-repo/base
- role: core/base
- role: core/sshd/base
- - 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
+ - role: streaming/c3voc/base
- - 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
+### finalize using c3voc bundlewrap repo: https://github.com/voc/cm
+# git clone https://github.com/voc/cm.git
+# cd cm/bundlewrap
+# bw run minion-glt1 true
+# bw apply miniion-glt1
diff --git a/spreadspace/glt-helene.yml b/spreadspace/glt-helene.yml
index 6425846e..7deb7f17 100644
--- a/spreadspace/glt-helene.yml
+++ b/spreadspace/glt-helene.yml
@@ -5,9 +5,6 @@
- role: apt-repo/base
- role: core/base
- role: core/sshd/base
- - role: core/zsh
- - role: core/ntp
- - role: core/cpu-microcode
- role: streaming/c3voc/base
### finalize using c3voc bundlewrap repo: https://github.com/voc/cm
diff --git a/spreadspace/glt-telesto.yml b/spreadspace/glt-telesto.yml
index c200e83b..7ffec0df 100644
--- a/spreadspace/glt-telesto.yml
+++ b/spreadspace/glt-telesto.yml
@@ -5,40 +5,10 @@
- role: apt-repo/base
- role: core/base
- role: core/sshd/base
- - role: core/zsh
- - role: core/ntp
- - role: core/cpu-microcode
- - role: storage/zfs/pools
- - role: apt-repo/spreadspace
- - role: streaming/blackmagic/desktopvideo
- - role: kubernetes/base
- - role: kubernetes/standalone/base
- - role: streaming/recorder
- post_tasks:
- - name: install lm-sensors and i7z
- apt:
- name:
- - lm-sensors
- - i7z
+ - role: streaming/c3voc/base
- - name: load modules for lm-sensors
- vars:
- sensors_modules:
- - coretemp
- - w83627ehf
- 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
+### finalize using c3voc bundlewrap repo: https://github.com/voc/cm
+# git clone https://github.com/voc/cm.git
+# cd cm/bundlewrap
+# bw run minion-glt2 true
+# bw apply miniion-glt2
diff --git a/spreadspace/glt-thetys.yml b/spreadspace/glt-thetys.yml
index 55ab206f..67506dcd 100644
--- a/spreadspace/glt-thetys.yml
+++ b/spreadspace/glt-thetys.yml
@@ -5,9 +5,6 @@
- role: apt-repo/base
- role: core/base
- role: core/sshd/base
- - role: core/zsh
- - role: core/ntp
- - role: core/cpu-microcode
- role: streaming/c3voc/base
### finalize using c3voc bundlewrap repo: https://github.com/voc/cm
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-29 06:52:28 +0000