remove ch-helene frm k8s cluster chtest for now and migrate to new streaming containers

11 files changed, 38 insertions, 30 deletions

diff --git a/inventory/host_vars/ch-dione.yml b/inventory/host_vars/ch-dione.yml
index d9feac7c..662b497f 100644
--- a/inventory/host_vars/ch-dione.yml
+++ b/inventory/host_vars/ch-dione.yml
@@ -61,7 +61,8 @@ kubelet_storage:
 
 # rtmp_streamer_base_path: /srv/storage/streamer
 # rtmp_streamer_inst_name: feed
-# rtmp_streamer_nginx_image_version: 2022-04-29.23
+# rtmp_streamer_nginx_image_version: 2022-05-15.24
+# rtmp_streamer_ffmpeg_image_version: bullseye-decklink11.7-2022-05-15.13
 # rtmp_streamer_decklink_card: "DeckLink 8K Pro (1)"
 # rtmp_streamer_config:
 #   input_params: ['-f', 'decklink', '-video_input', 'sdi', '-format_code', 'Hp50', '-ac', '2', '-i']
diff --git a/inventory/host_vars/ch-helene.yml b/inventory/host_vars/ch-helene.yml
index 9640c409..b29c048d 100644
--- a/inventory/host_vars/ch-helene.yml
+++ b/inventory/host_vars/ch-helene.yml
@@ -31,21 +31,21 @@ 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
-
-containerd_storage:
+docker_pkg_provider: docker-com
+docker_storage:
   type: lvm
   vg: "{{ host_name }}"
-  lv: containerd
+  lv: docker
   size: 10G
   fs: ext4
 
+# containerd_storage:
+#   type: lvm
+#   vg: "{{ host_name }}"
+#   lv: containerd
+#   size: 10G
+#   fs: ext4
+
 kubelet_storage:
   type: lvm
   vg: "{{ host_name }}"
@@ -53,15 +53,16 @@ kubelet_storage:
   size: 5G
   fs: ext4
 
-# kubernetes_version: 1.24.0
-# kubernetes_container_runtime: docker
-# kubernetes_standalone_max_pods: 42
-# kubernetes_standalone_cni_variant: with-portmap
+kubernetes_version: 1.24.0
+kubernetes_container_runtime: docker
+kubernetes_standalone_max_pods: 42
+kubernetes_standalone_cni_variant: with-portmap
 
 
-# rtmp_streamer_base_path: /srv/storage/streamer
-# rtmp_streamer_inst_name: feed
-# rtmp_streamer_nginx_image_version: 2022-04-29.23
-# rtmp_streamer_decklink_card: "DeckLink SDI 4K"
-# rtmp_streamer_config:
-#   input_params: ['-f', 'decklink', '-video_input', 'sdi', '-format_code', 'Hp50', '-ac', '2', '-i']
+rtmp_streamer_base_path: /srv/storage/streamer
+rtmp_streamer_inst_name: feed
+rtmp_streamer_nginx_image_version: 2022-05-15.24
+rtmp_streamer_ffmpeg_image_version: bullseye-decklink11.7-2022-05-15.13
+rtmp_streamer_decklink_card: "DeckLink SDI 4K"
+rtmp_streamer_config:
+  input_params: ['-f', 'decklink', '-video_input', 'sdi', '-format_code', 'Hp50', '-ac', '2', '-i']
diff --git a/inventory/host_vars/ch-thetys.yml b/inventory/host_vars/ch-thetys.yml
index 6863c248..d77364ea 100644
--- a/inventory/host_vars/ch-thetys.yml
+++ b/inventory/host_vars/ch-thetys.yml
@@ -54,7 +54,8 @@ kubernetes_standalone_cni_variant: with-portmap
 
 rtmp_streamer_base_path: /srv/storage/streamer
 rtmp_streamer_inst_name: feed
-rtmp_streamer_nginx_image_version: 2022-04-29.23
+rtmp_streamer_nginx_image_version: 2022-05-15.24
+rtmp_streamer_ffmpeg_image_version: bullseye-decklink11.7-2022-05-15.13
 rtmp_streamer_decklink_card: "DeckLink Mini Recorder"
 rtmp_streamer_config:
   input_params: ['-f', 'decklink', '-video_input', 'sdi', '-format_code', 'Hp25', '-ac', '2', '-i']
diff --git a/inventory/host_vars/ele-thetys.yml b/inventory/host_vars/ele-thetys.yml
index bd22ef27..59545f8b 100644
--- a/inventory/host_vars/ele-thetys.yml
+++ b/inventory/host_vars/ele-thetys.yml
@@ -70,7 +70,8 @@ rtmp_streamer_storage:
   fs: ext4
 rtmp_streamer_base_path: /srv/streamer
 rtmp_streamer_inst_name: emc-test
-rtmp_streamer_nginx_image_version: 2021-02-24.20
+rtmp_streamer_nginx_image_version: 2022-05-15.24
+rtmp_streamer_ffmpeg_image_version: bullseye-decklink11.7-2022-05-15.13
 rtmp_streamer_decklink_card: "DeckLink Mini Recorder"
 rtmp_streamer_config:
   input_params: ['-f', 'decklink', '-video_input', 'sdi', '-format_code', 'Hp25', '-ac', '2', '-i']
diff --git a/inventory/host_vars/glt-calypso.yml b/inventory/host_vars/glt-calypso.yml
index b8ef59e3..d671a680 100644
--- a/inventory/host_vars/glt-calypso.yml
+++ b/inventory/host_vars/glt-calypso.yml
@@ -68,7 +68,7 @@ recorder_storage:
   name: recorder
 recorder_base_path: /srv/storage/recorder
 recorder_inst_name: feed-glt21s1
-recorder_ffmpeg_image_version: 2021-02-24.7
+recorder_ffmpeg_image_version: bullseye-decklink11.7-2022-05-15.13
 recorder_decklink_card: "DeckLink SDI (1)"
 recorder_decklink_format_code: Hp25
 
diff --git a/inventory/host_vars/glt-dione.yml b/inventory/host_vars/glt-dione.yml
index 583fc56a..2cf44bb1 100644
--- a/inventory/host_vars/glt-dione.yml
+++ b/inventory/host_vars/glt-dione.yml
@@ -61,7 +61,8 @@ rtmp_streamer_storage:
   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_nginx_image_version: 2022-05-15.24
+rtmp_streamer_ffmpeg_image_version: bullseye-decklink11.7-2022-05-15.13
 rtmp_streamer_decklink_card: "DeckLink 8K Pro (1)"
 rtmp_streamer_config:
   input_params: ['-f', 'decklink', '-format_code', 'Hp25', '-ac', '2', '-i']
diff --git a/inventory/host_vars/glt-helene.yml b/inventory/host_vars/glt-helene.yml
index 22880793..84bd9eee 100644
--- a/inventory/host_vars/glt-helene.yml
+++ b/inventory/host_vars/glt-helene.yml
@@ -61,7 +61,8 @@ rtmp_streamer_storage:
   fs: ext4
 rtmp_streamer_base_path: /srv/streamer
 rtmp_streamer_inst_name: feed-glt21s2
-rtmp_streamer_nginx_image_version: 2021-02-24.20
+rtmp_streamer_nginx_image_version: 2022-05-15.24
+rtmp_streamer_ffmpeg_image_version: bullseye-decklink11.7-2022-05-15.13
 rtmp_streamer_decklink_card: "DeckLink SDI 4K"
 rtmp_streamer_config:
   input_params: ['-f', 'decklink', '-format_code', 'Hp25', '-ac', '2', '-i']
diff --git a/inventory/host_vars/glt-telesto.yml b/inventory/host_vars/glt-telesto.yml
index 7f3440f6..421226d9 100644
--- a/inventory/host_vars/glt-telesto.yml
+++ b/inventory/host_vars/glt-telesto.yml
@@ -68,7 +68,7 @@ recorder_storage:
   name: recorder
 recorder_base_path: /srv/storage/recorder
 recorder_inst_name: feed-glt21s2
-recorder_ffmpeg_image_version: 2021-02-24.7
+recorder_ffmpeg_image_version: bullseye-decklink11.7-2022-05-15.13
 recorder_decklink_card: "DeckLink SDI"
 recorder_decklink_format_code: Hp25
 
diff --git a/inventory/host_vars/glt-tsdatacop.yml b/inventory/host_vars/glt-tsdatacop.yml
index 851c13fe..c72b57e2 100644
--- a/inventory/host_vars/glt-tsdatacop.yml
+++ b/inventory/host_vars/glt-tsdatacop.yml
@@ -66,7 +66,7 @@ recorder_storage:
   fs: ext4
 recorder_base_path: /srv/recorder
 recorder_inst_name: feed-glt21s3
-recorder_ffmpeg_image_version: 2021-02-24.7
+recorder_ffmpeg_image_version: bullseye-decklink11.7-2022-05-15.13
 recorder_decklink_card: "DeckLink Mini Recorder"
 recorder_decklink_format_code: Hp25
 
diff --git a/inventory/host_vars/s2-thetys.yml b/inventory/host_vars/s2-thetys.yml
index e827c5e7..cd655006 100644
--- a/inventory/host_vars/s2-thetys.yml
+++ b/inventory/host_vars/s2-thetys.yml
@@ -68,7 +68,8 @@ zfs_pools:
 
 rtmp_streamer_base_path: /srv/storage/streamer
 rtmp_streamer_inst_name: feed
-rtmp_streamer_nginx_image_version: 2021-02-24.20
+rtmp_streamer_nginx_image_version: 2022-05-15.24
+rtmp_streamer_ffmpeg_image_version: bullseye-decklink11.7-2022-05-15.13
 rtmp_streamer_decklink_card: "DeckLink Mini Recorder"
 rtmp_streamer_recording:
   level: full
diff --git a/inventory/hosts.ini b/inventory/hosts.ini
index 581913b6..5a0fbf81 100644
--- a/inventory/hosts.ini
+++ b/inventory/hosts.ini
@@ -520,6 +520,7 @@ ele-jitsi
 s2-thetys
 sk-tomnext-nc
 ch-thetys
+ch-helene
 glt-coturn
 glt-meet1
 glt-meet2
@@ -561,7 +562,7 @@ k8s-emc-streamer
 ### Kubernetes Cluster: chtest
 [k8s-chtest-encoder]
 ch-dione
-ch-helene
+#ch-helene
 
 [k8s-chtest-ctrl]
 ch-k8s-ctrl