summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--inventory/host_vars/glt-dione.yml4
-rw-r--r--inventory/host_vars/glt-helene.yml4
-rw-r--r--inventory/host_vars/glt-thetys.yml29
-rw-r--r--spreadspace/glt-thetys.yml5
4 files changed, 17 insertions, 25 deletions
diff --git a/inventory/host_vars/glt-dione.yml b/inventory/host_vars/glt-dione.yml
index b5ab1125..32cdc896 100644
--- a/inventory/host_vars/glt-dione.yml
+++ b/inventory/host_vars/glt-dione.yml
@@ -68,12 +68,12 @@ kubernetes_standalone_max_pods: 42
kubernetes_standalone_cni_variant: with-portmap
-rtmp_streamer_lvm:
+rtmp_streamer_storage:
+ type: lvm
vg: "{{ host_name }}"
lv: streamer
size: 200G
fs: ext4
-
rtmp_streamer_base_path: /srv/streamer
rtmp_streamer_inst_name: feed-glt21s2
rtmp_streamer_nginx_image_version: 2021-02-24.20
diff --git a/inventory/host_vars/glt-helene.yml b/inventory/host_vars/glt-helene.yml
index a7a32604..6f425c85 100644
--- a/inventory/host_vars/glt-helene.yml
+++ b/inventory/host_vars/glt-helene.yml
@@ -68,12 +68,12 @@ kubernetes_standalone_max_pods: 42
kubernetes_standalone_cni_variant: with-portmap
-rtmp_streamer_lvm:
+rtmp_streamer_storage:
+ type: lvm
vg: "{{ host_name }}"
lv: streamer
size: 200G
fs: ext4
-
rtmp_streamer_base_path: /srv/streamer
rtmp_streamer_inst_name: feed-glt21s3
rtmp_streamer_nginx_image_version: 2021-02-24.20
diff --git a/inventory/host_vars/glt-thetys.yml b/inventory/host_vars/glt-thetys.yml
index 37916df5..d1c9f56d 100644
--- a/inventory/host_vars/glt-thetys.yml
+++ b/inventory/host_vars/glt-thetys.yml
@@ -41,19 +41,11 @@ apt_repo_components:
- non-free ## for microcode updates
-# lvm_groups:
-# storage:
-# pvs:
-# - /dev/disk/by-id/ata-WDC_WD5000LPVX-22V0TT0_WD-WX81AB371127-part1
-
-zfs_arc_size:
- min: 2GB
- max: 4GB
-
-zfs_pools:
+lvm_groups:
storage:
- mountpoint: /srv/storage
- create_vdevs: /dev/disk/by-id/ata-WDC_WD5000LPVX-22V0TT0_WD-WX81AB371127-part1
+ pvs:
+ - /dev/disk/by-id/ata-WDC_WD5000LPVX-22V0TT0_WD-WX81AB371127-part1
+
blackmagic_desktopvideo_version: 11.7a12
blackmagic_desktopvideo_include_gui: yes
@@ -80,13 +72,14 @@ kubernetes_container_runtime: docker
kubernetes_standalone_max_pods: 42
kubernetes_standalone_cni_variant: with-portmap
+
rtmp_streamer_storage:
- type: zfs
- pool: storage
- name: streamer
- properties:
- quota: 400G
-rtmp_streamer_base_path: /srv/storage/streamer
+ type: lvm
+ vg: storage
+ lv: streamer
+ size: 400G
+ fs: ext4
+rtmp_streamer_base_path: /srv/streamer
rtmp_streamer_inst_name: feed-glt21s1
rtmp_streamer_nginx_image_version: 2021-02-24.20
rtmp_streamer_decklink_card: "DeckLink Mini Recorder"
diff --git a/spreadspace/glt-thetys.yml b/spreadspace/glt-thetys.yml
index 888fd9bd..e07dbaf5 100644
--- a/spreadspace/glt-thetys.yml
+++ b/spreadspace/glt-thetys.yml
@@ -9,12 +9,11 @@
- role: core/ntp
- role: core/cpu-microcode
- role: apt-repo/spreadspace
- #- role: storage/lvm/groups
- - role: storage/zfs/pools
+ - role: storage/lvm/groups
- role: streaming/blackmagic/desktopvideo
- role: kubernetes/base
- role: kubernetes/standalone/base
- #- role: streaming/rtmp/streamer
+ - role: streaming/rtmp/streamer
post_tasks:
- name: install lm-sensors and i7z
apt: