From e163fb53e277c8b8b3dcd36e9fcc0d7d16b94976 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Fri, 23 Feb 2018 12:45:55 +0100
Subject: refactor k8s templates

---
 templates/default/kubernetes/nginx-streamer-cm.yml.j2 | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'templates/default/kubernetes/nginx-streamer-cm.yml.j2')

diff --git a/templates/default/kubernetes/nginx-streamer-cm.yml.j2 b/templates/default/kubernetes/nginx-streamer-cm.yml.j2
index 563245c..c97bd63 100644
--- a/templates/default/kubernetes/nginx-streamer-cm.yml.j2
+++ b/templates/default/kubernetes/nginx-streamer-cm.yml.j2
@@ -2,11 +2,11 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   namespace: {{ namespace }}
-  name: nginx-streamer-{{ worker.name }}
+  name: nginx-streamer-{{ deploy.worker.name }}
   labels:
     app: nginx
     type: streamer
-    worker: {{ worker.name }}
+    worker: {{ deploy.worker.name }}
 data:
   nginx.conf: |
     worker_processes 4;
@@ -35,8 +35,8 @@ data:
       access_log /dev/null;
 
       server {
-        listen {{ desc.streams[worker.flags.stream].port }} default_server;
-        listen [::]:{{ desc.streams[worker.flags.stream].port }} default_server;
+        listen {{ desc.streams[deploy.worker.flags.stream].port }} default_server;
+        listen [::]:{{ desc.streams[deploy.worker.flags.stream].port }} default_server;
         server_name _;
 
         root /srv/www;
@@ -69,9 +69,9 @@ data:
           hls_fragment_naming timestamp;
           hls_fragment_slicing aligned;
           hls_type live;
-          hls_base_url http://{{ worker.flags['stream-hostname'] }}:{{ desc.streams[worker.flags.stream].port }}/hls/;
+          hls_base_url http://{{ deploy.worker.flags['stream-hostname'] }}:{{ desc.streams[deploy.worker.flags.stream].port }}/hls/;
 
-%% for mux in desc.streams[worker.flags.stream]['nginx-muxes']
+%% for mux in desc.streams[deploy.worker.flags.stream]['nginx-muxes']
 %%   for profile in desc.muxes[mux].formats.flash
 %%     set abitrate = desc.globals.profiles[profile].audio
 %%     set vbitrate = desc.globals.bitrates[desc.globals.formats.flash.video][desc.globals.profiles[profile].video]
@@ -92,9 +92,9 @@ data:
         }
 
         respawn on;
-%% for mux in desc.streams[worker.flags.stream]['nginx-muxes']
+%% for mux in desc.streams[deploy.worker.flags.stream]['nginx-muxes']
 %%   for profile in desc.muxes[mux].formats.flash
-        exec_static ffmpeg -i http://flumotion-worker-{{ worker.name }}:{{ desc.streams[worker.flags.stream].port }}/{{ mux }}-flash-{{ profile }}.flv
+        exec_static ffmpeg -i http://flumotion-worker-{{ deploy.worker.name }}:{{ desc.streams[deploy.worker.flags.stream].port }}/{{ mux }}-flash-{{ profile }}.flv
               -acodec copy -vcodec copy -vbsf h264_mp4toannexb -f flv rtmp://localhost/hls/{{ mux }}-{{ profile }}
               -acodec copy -vcodec copy -vbsf h264_mp4toannexb -f flv rtmp://localhost/dash/{{ mux }}-{{ profile }};
 %%   endfor
-- 
cgit v1.2.3