diff options
author | Christian Pointner <equinox@spreadspace.org> | 2022-06-13 19:51:43 +0200 |
---|---|---|
committer | Christian Pointner <equinox@spreadspace.org> | 2022-06-13 19:51:43 +0200 |
commit | e94739892a92fd163b93459e70a720c86d82eb1d (patch) | |
tree | 324583bb892f259c16fc7ddde9d91fc49f6ac7cd | |
parent | streaming/recorder: make use of new recording script in docker container (diff) |
streaming/recorder: new image with target option
-rw-r--r-- | inventory/host_vars/ch-thetys.yml | 2 | ||||
-rw-r--r-- | inventory/host_vars/glt-calypso.yml | 2 | ||||
-rw-r--r-- | inventory/host_vars/glt-telesto.yml | 2 | ||||
-rw-r--r-- | inventory/host_vars/glt-tsdatacop.yml | 2 | ||||
-rw-r--r-- | roles/streaming/recorder/defaults/main.yml | 2 | ||||
-rw-r--r-- | roles/streaming/recorder/tasks/main.yml | 2 | ||||
-rw-r--r-- | roles/streaming/recorder/templates/pod-spec.yml.j2 | 1 |
7 files changed, 6 insertions, 7 deletions
diff --git a/inventory/host_vars/ch-thetys.yml b/inventory/host_vars/ch-thetys.yml index 37bf9aa9..907a7f9d 100644 --- a/inventory/host_vars/ch-thetys.yml +++ b/inventory/host_vars/ch-thetys.yml @@ -47,7 +47,7 @@ kubelet_storage: size: 5G fs: ext4 -kubernetes_version: 1.24.0 +kubernetes_version: 1.24.1 kubernetes_container_runtime: docker kubernetes_standalone_max_pods: 42 kubernetes_standalone_cni_variant: with-portmap diff --git a/inventory/host_vars/glt-calypso.yml b/inventory/host_vars/glt-calypso.yml index 1be55df8..c8922705 100644 --- a/inventory/host_vars/glt-calypso.yml +++ b/inventory/host_vars/glt-calypso.yml @@ -69,7 +69,7 @@ recorder_storage: name: recorder recorder_base_path: /srv/storage/recorder recorder_inst_name: feed-glt21s1 -recorder_ffmpeg_image_version: bullseye-decklink11.7-2022-05-29.21 +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 (1)'] recorder_video_filter_common: "colorspace=iall=bt709:irange=tv:all=bt709:range=tv" diff --git a/inventory/host_vars/glt-telesto.yml b/inventory/host_vars/glt-telesto.yml index 778c2804..0963d8ab 100644 --- a/inventory/host_vars/glt-telesto.yml +++ b/inventory/host_vars/glt-telesto.yml @@ -69,7 +69,7 @@ recorder_storage: name: recorder recorder_base_path: /srv/storage/recorder recorder_inst_name: feed-glt21s2 -recorder_ffmpeg_image_version: bullseye-decklink11.7-2022-05-29.21 +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" diff --git a/inventory/host_vars/glt-tsdatacop.yml b/inventory/host_vars/glt-tsdatacop.yml index 338a1057..0ded12df 100644 --- a/inventory/host_vars/glt-tsdatacop.yml +++ b/inventory/host_vars/glt-tsdatacop.yml @@ -67,7 +67,7 @@ recorder_storage: fs: ext4 recorder_base_path: /srv/recorder recorder_inst_name: feed-glt21s3 -recorder_ffmpeg_image_version: bullseye-decklink11.7-2022-05-29.21 +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 Mini Recorder'] recorder_video_filter_common: "colorspace=iall=bt709:irange=tv:all=bt709:range=tv" diff --git a/roles/streaming/recorder/defaults/main.yml b/roles/streaming/recorder/defaults/main.yml index e7dca7f1..c80b87b1 100644 --- a/roles/streaming/recorder/defaults/main.yml +++ b/roles/streaming/recorder/defaults/main.yml @@ -5,7 +5,7 @@ recorder_base_path: /srv/recorder # recorder_inst_name: feed -# recorder_ffmpeg_image_version: bullseye-decklink11.7-2022-05-29.21 +# 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 Mini Recorder'] # recorder_video_filter_common: "colorspace=iall=bt709:irange=tv:all=bt709:range=tv" recorder_audio_tracks: diff --git a/roles/streaming/recorder/tasks/main.yml b/roles/streaming/recorder/tasks/main.yml index e1588c83..f4065739 100644 --- a/roles/streaming/recorder/tasks/main.yml +++ b/roles/streaming/recorder/tasks/main.yml @@ -13,7 +13,7 @@ - name: generate recorder config copy: - content: "{{ recorder_config | combine({'record': {'segment_time': recorder_segment_time, 'clocktime_offset': recorder_segment_clocktime_offset}}) | to_nice_yaml }}\n" + content: "{{ recorder_config | combine({'record': {'segment_time': recorder_segment_time, 'clocktime_offset': recorder_segment_clocktime_offset, 'target': '/srv/recordings'}}) | to_nice_yaml }}\n" dest: "{{ recorder_base_path }}/{{ recorder_inst_name }}/config.yml" - name: create recording directory diff --git a/roles/streaming/recorder/templates/pod-spec.yml.j2 b/roles/streaming/recorder/templates/pod-spec.yml.j2 index cef622bc..8fbeadba 100644 --- a/roles/streaming/recorder/templates/pod-spec.yml.j2 +++ b/roles/streaming/recorder/templates/pod-spec.yml.j2 @@ -19,7 +19,6 @@ containers: - name: VIDEO_FILTER_COMMON value: "{{ recorder_video_filter_common }}" {% endif %} - workingDir: /srv/recordings securityContext: privileged: true volumeMounts: |