From a43d1a058491d0255fd732f2f964379f18418356 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Sat, 3 Feb 2018 03:15:56 +0100
Subject: deploying manager to k8s works now

---
 templates/default/flumotion/aac-encode.xml         | 12 -----
 templates/default/flumotion/aac-encode.xml.j2      | 12 +++++
 templates/default/flumotion/audio-resample.xml     | 12 -----
 templates/default/flumotion/audio-resample.xml.j2  | 12 +++++
 templates/default/flumotion/audiotest.xml          | 11 ----
 templates/default/flumotion/audiotest.xml.j2       | 11 ++++
 templates/default/flumotion/decklink.xml           | 13 -----
 templates/default/flumotion/decklink.xml.j2        | 13 +++++
 templates/default/flumotion/flv-mux.xml            | 14 -----
 templates/default/flumotion/flv-mux.xml.j2         | 14 +++++
 templates/default/flumotion/h264-encode.xml        | 12 -----
 templates/default/flumotion/h264-encode.xml.j2     | 12 +++++
 templates/default/flumotion/http-stream.xml        | 39 --------------
 templates/default/flumotion/http-stream.xml.j2     | 39 ++++++++++++++
 templates/default/flumotion/mjpeg-encode.xml       | 12 -----
 templates/default/flumotion/mjpeg-encode.xml.j2    | 12 +++++
 templates/default/flumotion/mkv-mux.xml            | 14 -----
 templates/default/flumotion/mkv-mux.xml.j2         | 14 +++++
 templates/default/flumotion/mp3-encode.xml         | 12 -----
 templates/default/flumotion/mp3-encode.xml.j2      | 12 +++++
 templates/default/flumotion/mp3-mux.xml            | 12 -----
 templates/default/flumotion/mp3-mux.xml.j2         | 12 +++++
 templates/default/flumotion/mpeg2-encode.xml       | 12 -----
 templates/default/flumotion/mpeg2-encode.xml.j2    | 12 +++++
 templates/default/flumotion/mpegts-mux.xml         | 14 -----
 templates/default/flumotion/mpegts-mux.xml.j2      | 14 +++++
 templates/default/flumotion/ogg-mux.xml            | 14 -----
 templates/default/flumotion/ogg-mux.xml.j2         | 14 +++++
 templates/default/flumotion/opus-encode.xml        | 12 -----
 templates/default/flumotion/opus-encode.xml.j2     | 12 +++++
 templates/default/flumotion/planet.xml             | 58 --------------------
 templates/default/flumotion/planet.xml.j2          | 58 ++++++++++++++++++++
 templates/default/flumotion/porter.xml             | 10 ----
 templates/default/flumotion/porter.xml.j2          | 10 ++++
 templates/default/flumotion/raw-encode.xml         | 12 -----
 templates/default/flumotion/raw-encode.xml.j2      | 12 +++++
 templates/default/flumotion/recorder.xml           | 14 -----
 templates/default/flumotion/recorder.xml.j2        | 14 +++++
 templates/default/flumotion/repeater.xml           | 11 ----
 templates/default/flumotion/repeater.xml.j2        | 11 ++++
 templates/default/flumotion/soundcard.xml          | 24 ---------
 templates/default/flumotion/soundcard.xml.j2       | 24 +++++++++
 templates/default/flumotion/video-resize.xml       | 12 -----
 templates/default/flumotion/video-resize.xml.j2    | 12 +++++
 templates/default/flumotion/videotest.xml          | 11 ----
 templates/default/flumotion/videotest.xml.j2       | 11 ++++
 templates/default/flumotion/vorbis-encode.xml      | 12 -----
 templates/default/flumotion/vorbis-encode.xml.j2   | 12 +++++
 templates/default/flumotion/vp8-encode.xml         | 13 -----
 templates/default/flumotion/vp8-encode.xml.j2      | 12 +++++
 templates/default/flumotion/webm-mux.xml           | 14 -----
 templates/default/flumotion/webm-mux.xml.j2        | 14 +++++
 templates/default/flumotion/worker.xml             | 20 -------
 templates/default/flumotion/worker.xml.j2          | 20 +++++++
 .../default/kubernetes/flumotion-manager-cm.yml.j2 | 23 ++++++++
 .../kubernetes/flumotion-manager-deploy.yml.j2     | 43 +++++++++++++++
 .../kubernetes/flumotion-manager-svc.yml.j2        | 20 +++++++
 .../kubernetes/flumotion-worker-deploy.yml.j2      | 61 ++++++++++++++++++++++
 58 files changed, 572 insertions(+), 426 deletions(-)
 delete mode 100644 templates/default/flumotion/aac-encode.xml
 create mode 100644 templates/default/flumotion/aac-encode.xml.j2
 delete mode 100644 templates/default/flumotion/audio-resample.xml
 create mode 100644 templates/default/flumotion/audio-resample.xml.j2
 delete mode 100644 templates/default/flumotion/audiotest.xml
 create mode 100644 templates/default/flumotion/audiotest.xml.j2
 delete mode 100644 templates/default/flumotion/decklink.xml
 create mode 100644 templates/default/flumotion/decklink.xml.j2
 delete mode 100644 templates/default/flumotion/flv-mux.xml
 create mode 100644 templates/default/flumotion/flv-mux.xml.j2
 delete mode 100644 templates/default/flumotion/h264-encode.xml
 create mode 100644 templates/default/flumotion/h264-encode.xml.j2
 delete mode 100644 templates/default/flumotion/http-stream.xml
 create mode 100644 templates/default/flumotion/http-stream.xml.j2
 delete mode 100644 templates/default/flumotion/mjpeg-encode.xml
 create mode 100644 templates/default/flumotion/mjpeg-encode.xml.j2
 delete mode 100644 templates/default/flumotion/mkv-mux.xml
 create mode 100644 templates/default/flumotion/mkv-mux.xml.j2
 delete mode 100644 templates/default/flumotion/mp3-encode.xml
 create mode 100644 templates/default/flumotion/mp3-encode.xml.j2
 delete mode 100644 templates/default/flumotion/mp3-mux.xml
 create mode 100644 templates/default/flumotion/mp3-mux.xml.j2
 delete mode 100644 templates/default/flumotion/mpeg2-encode.xml
 create mode 100644 templates/default/flumotion/mpeg2-encode.xml.j2
 delete mode 100644 templates/default/flumotion/mpegts-mux.xml
 create mode 100644 templates/default/flumotion/mpegts-mux.xml.j2
 delete mode 100644 templates/default/flumotion/ogg-mux.xml
 create mode 100644 templates/default/flumotion/ogg-mux.xml.j2
 delete mode 100644 templates/default/flumotion/opus-encode.xml
 create mode 100644 templates/default/flumotion/opus-encode.xml.j2
 delete mode 100644 templates/default/flumotion/planet.xml
 create mode 100644 templates/default/flumotion/planet.xml.j2
 delete mode 100644 templates/default/flumotion/porter.xml
 create mode 100644 templates/default/flumotion/porter.xml.j2
 delete mode 100644 templates/default/flumotion/raw-encode.xml
 create mode 100644 templates/default/flumotion/raw-encode.xml.j2
 delete mode 100644 templates/default/flumotion/recorder.xml
 create mode 100644 templates/default/flumotion/recorder.xml.j2
 delete mode 100644 templates/default/flumotion/repeater.xml
 create mode 100644 templates/default/flumotion/repeater.xml.j2
 delete mode 100644 templates/default/flumotion/soundcard.xml
 create mode 100644 templates/default/flumotion/soundcard.xml.j2
 delete mode 100644 templates/default/flumotion/video-resize.xml
 create mode 100644 templates/default/flumotion/video-resize.xml.j2
 delete mode 100644 templates/default/flumotion/videotest.xml
 create mode 100644 templates/default/flumotion/videotest.xml.j2
 delete mode 100644 templates/default/flumotion/vorbis-encode.xml
 create mode 100644 templates/default/flumotion/vorbis-encode.xml.j2
 delete mode 100644 templates/default/flumotion/vp8-encode.xml
 create mode 100644 templates/default/flumotion/vp8-encode.xml.j2
 delete mode 100644 templates/default/flumotion/webm-mux.xml
 create mode 100644 templates/default/flumotion/webm-mux.xml.j2
 delete mode 100644 templates/default/flumotion/worker.xml
 create mode 100644 templates/default/flumotion/worker.xml.j2
 create mode 100644 templates/default/kubernetes/flumotion-manager-cm.yml.j2
 create mode 100644 templates/default/kubernetes/flumotion-manager-deploy.yml.j2
 create mode 100644 templates/default/kubernetes/flumotion-manager-svc.yml.j2
 create mode 100644 templates/default/kubernetes/flumotion-worker-deploy.yml.j2

(limited to 'templates')

diff --git a/templates/default/flumotion/aac-encode.xml b/templates/default/flumotion/aac-encode.xml
deleted file mode 100644
index 950f144..0000000
--- a/templates/default/flumotion/aac-encode.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-    <component name="{{ name }}"
-               type="pipeline-converter"
-               label="{{ component.desc }}"
-               worker="{{ component.worker }}"
-               project="flumotion"
-               version="{{ globals.version }}">
-        <eater name="default">
-          <feed alias="default">{{ component.feeder }}</feed>
-        </eater>
-        <property name="pipeline">audioconvert ! voaacenc bitrate={{ component.properties['bitrate'] * 1000 }}</property>
-        <clock-master>false</clock-master>
-    </component>
diff --git a/templates/default/flumotion/aac-encode.xml.j2 b/templates/default/flumotion/aac-encode.xml.j2
new file mode 100644
index 0000000..950f144
--- /dev/null
+++ b/templates/default/flumotion/aac-encode.xml.j2
@@ -0,0 +1,12 @@
+    <component name="{{ name }}"
+               type="pipeline-converter"
+               label="{{ component.desc }}"
+               worker="{{ component.worker }}"
+               project="flumotion"
+               version="{{ globals.version }}">
+        <eater name="default">
+          <feed alias="default">{{ component.feeder }}</feed>
+        </eater>
+        <property name="pipeline">audioconvert ! voaacenc bitrate={{ component.properties['bitrate'] * 1000 }}</property>
+        <clock-master>false</clock-master>
+    </component>
diff --git a/templates/default/flumotion/audio-resample.xml b/templates/default/flumotion/audio-resample.xml
deleted file mode 100644
index 7182b01..0000000
--- a/templates/default/flumotion/audio-resample.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-    <component name="{{ name }}"
-               type="pipeline-converter"
-               label="{{ component.desc }}"
-               worker="{{ component.worker }}"
-               project="flumotion"
-               version="{{ globals.version }}">
-        <eater name="default">
-          <feed alias="default">{{ component.feeder }}</feed>
-        </eater>
-        <property name="pipeline">audioresample ! audio/x-raw-int,rate={{ component.properties['samplerate'] }}</property>
-        <clock-master>false</clock-master>
-    </component>
diff --git a/templates/default/flumotion/audio-resample.xml.j2 b/templates/default/flumotion/audio-resample.xml.j2
new file mode 100644
index 0000000..7182b01
--- /dev/null
+++ b/templates/default/flumotion/audio-resample.xml.j2
@@ -0,0 +1,12 @@
+    <component name="{{ name }}"
+               type="pipeline-converter"
+               label="{{ component.desc }}"
+               worker="{{ component.worker }}"
+               project="flumotion"
+               version="{{ globals.version }}">
+        <eater name="default">
+          <feed alias="default">{{ component.feeder }}</feed>
+        </eater>
+        <property name="pipeline">audioresample ! audio/x-raw-int,rate={{ component.properties['samplerate'] }}</property>
+        <clock-master>false</clock-master>
+    </component>
diff --git a/templates/default/flumotion/audiotest.xml b/templates/default/flumotion/audiotest.xml
deleted file mode 100644
index 9e0f208..0000000
--- a/templates/default/flumotion/audiotest.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-    <component name="{{ name }}"
-               type="audiotest-producer"
-               label="{{ component.desc }}"
-               worker="{{ component.worker }}"
-               project="flumotion"
-               version="{{ globals.version }}">
-%% for name, value in component.properties.items()
-        <property name="{{ name }}">{{ value }}</property>
-%% endfor
-        <clock-master>{{ component.master }}</clock-master>
-    </component>
diff --git a/templates/default/flumotion/audiotest.xml.j2 b/templates/default/flumotion/audiotest.xml.j2
new file mode 100644
index 0000000..9e0f208
--- /dev/null
+++ b/templates/default/flumotion/audiotest.xml.j2
@@ -0,0 +1,11 @@
+    <component name="{{ name }}"
+               type="audiotest-producer"
+               label="{{ component.desc }}"
+               worker="{{ component.worker }}"
+               project="flumotion"
+               version="{{ globals.version }}">
+%% for name, value in component.properties.items()
+        <property name="{{ name }}">{{ value }}</property>
+%% endfor
+        <clock-master>{{ component.master }}</clock-master>
+    </component>
diff --git a/templates/default/flumotion/decklink.xml b/templates/default/flumotion/decklink.xml
deleted file mode 100644
index cc82727..0000000
--- a/templates/default/flumotion/decklink.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-    <component name="{{ name }}"
-               type="decklink-producer"
-               label="{{ component.desc }}"
-               worker="{{ component.worker }}"
-               project="flumotion"
-               version="{{ globals.version }}">
-%% for name, value in component.properties.items()
-%%   if name != 'samplerate'
-        <property name="{{ name }}">{{ value }}</property>
-%%   endif
-%% endfor
-        <clock-master>{{ component.master }}</clock-master>
-    </component>
diff --git a/templates/default/flumotion/decklink.xml.j2 b/templates/default/flumotion/decklink.xml.j2
new file mode 100644
index 0000000..cc82727
--- /dev/null
+++ b/templates/default/flumotion/decklink.xml.j2
@@ -0,0 +1,13 @@
+    <component name="{{ name }}"
+               type="decklink-producer"
+               label="{{ component.desc }}"
+               worker="{{ component.worker }}"
+               project="flumotion"
+               version="{{ globals.version }}">
+%% for name, value in component.properties.items()
+%%   if name != 'samplerate'
+        <property name="{{ name }}">{{ value }}</property>
+%%   endif
+%% endfor
+        <clock-master>{{ component.master }}</clock-master>
+    </component>
diff --git a/templates/default/flumotion/flv-mux.xml b/templates/default/flumotion/flv-mux.xml
deleted file mode 100644
index be77ddb..0000000
--- a/templates/default/flumotion/flv-mux.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-    <component name="{{ name }}"
-               type="flv-muxer"
-               label="{{ component.desc }}"
-               worker="{{ component.worker }}"
-               project="flumotion"
-               version="{{ globals.version }}">
-        <eater name="default">
-          <feed alias="default">{{ component.feeder_audio }}</feed>
-%% if component.feeder_video
-          <feed alias="default-bis">{{ component.feeder_video }}</feed>
-%% endif
-        </eater>
-        <clock-master>false</clock-master>
-    </component>
diff --git a/templates/default/flumotion/flv-mux.xml.j2 b/templates/default/flumotion/flv-mux.xml.j2
new file mode 100644
index 0000000..be77ddb
--- /dev/null
+++ b/templates/default/flumotion/flv-mux.xml.j2
@@ -0,0 +1,14 @@
+    <component name="{{ name }}"
+               type="flv-muxer"
+               label="{{ component.desc }}"
+               worker="{{ component.worker }}"
+               project="flumotion"
+               version="{{ globals.version }}">
+        <eater name="default">
+          <feed alias="default">{{ component.feeder_audio }}</feed>
+%% if component.feeder_video
+          <feed alias="default-bis">{{ component.feeder_video }}</feed>
+%% endif
+        </eater>
+        <clock-master>false</clock-master>
+    </component>
diff --git a/templates/default/flumotion/h264-encode.xml b/templates/default/flumotion/h264-encode.xml
deleted file mode 100644
index a3c6edc..0000000
--- a/templates/default/flumotion/h264-encode.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-    <component name="{{ name }}"
-               type="pipeline-converter"
-               label="{{ component.desc }}"
-               worker="{{ component.worker }}"
-               project="flumotion"
-               version="{{ globals.version }}">
-        <eater name="default">
-          <feed alias="default">{{ component.feeder }}</feed>
-        </eater>
-        <property name="pipeline">ffmpegcolorspace ! x264enc bitrate={{ component.properties['bitrate'] }} profile=baseline threads=8 key-int-max=50 byte-stream=false</property>
-        <clock-master>false</clock-master>
-    </component>
diff --git a/templates/default/flumotion/h264-encode.xml.j2 b/templates/default/flumotion/h264-encode.xml.j2
new file mode 100644
index 0000000..a3c6edc
--- /dev/null
+++ b/templates/default/flumotion/h264-encode.xml.j2
@@ -0,0 +1,12 @@
+    <component name="{{ name }}"
+               type="pipeline-converter"
+               label="{{ component.desc }}"
+               worker="{{ component.worker }}"
+               project="flumotion"
+               version="{{ globals.version }}">
+        <eater name="default">
+          <feed alias="default">{{ component.feeder }}</feed>
+        </eater>
+        <property name="pipeline">ffmpegcolorspace ! x264enc bitrate={{ component.properties['bitrate'] }} profile=baseline threads=8 key-int-max=50 byte-stream=false</property>
+        <clock-master>false</clock-master>
+    </component>
diff --git a/templates/default/flumotion/http-stream.xml b/templates/default/flumotion/http-stream.xml
deleted file mode 100644
index d0cce33..0000000
--- a/templates/default/flumotion/http-stream.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-    <component name="{{ name }}"
-               type="http-streamer"
-               label="{{ component.desc }}"
-               worker="{{ component.worker }}"
-               project="flumotion"
-               version="{{ globals.version }}">
-        <eater name="default">
-          <feed alias="default">{{ component.feeder }}</feed>
-        </eater>
-%% if component.plugs is defined
-        <plugs>
-%%   for name, value in component.plugs.items()
-%%     if name == 'rrd'
-          <plug socket="flumotion.component.plugs.rrd.ComponentRRDPlug" type="component-rrd">
-            <property name="clients-connected-file">{{ value.clients }}</property>
-            <property name="bytes-transferred-file">{{ value.bytes }}</property>
-          </plug>
-%%     endif
-%%     if name == 'sfive'
-          <plug socket="flumotion.component.plugs.s5.ComponentSFivePlug" type="component-s5">
-%%       for name, value in value.items()
-%%         if name != 'tags'
-            <property name="{{ name }}">{{ value }}</property>
-%%         else
-            <property name="tags">{{ value|join(', ') }}</property>
-%%         endif
-%%       endfor
-          </plug>
-%%     endif
-%%   endfor
-        </plugs>
-%% endif
-%% for name, value in component.properties.items()
-%%   if name != 'samplerate'
-        <property name="{{ name }}">{{ value }}</property>
-%%   endif
-%% endfor
-        <clock-master>false</clock-master>
-    </component>
diff --git a/templates/default/flumotion/http-stream.xml.j2 b/templates/default/flumotion/http-stream.xml.j2
new file mode 100644
index 0000000..d0cce33
--- /dev/null
+++ b/templates/default/flumotion/http-stream.xml.j2
@@ -0,0 +1,39 @@
+    <component name="{{ name }}"
+               type="http-streamer"
+               label="{{ component.desc }}"
+               worker="{{ component.worker }}"
+               project="flumotion"
+               version="{{ globals.version }}">
+        <eater name="default">
+          <feed alias="default">{{ component.feeder }}</feed>
+        </eater>
+%% if component.plugs is defined
+        <plugs>
+%%   for name, value in component.plugs.items()
+%%     if name == 'rrd'
+          <plug socket="flumotion.component.plugs.rrd.ComponentRRDPlug" type="component-rrd">
+            <property name="clients-connected-file">{{ value.clients }}</property>
+            <property name="bytes-transferred-file">{{ value.bytes }}</property>
+          </plug>
+%%     endif
+%%     if name == 'sfive'
+          <plug socket="flumotion.component.plugs.s5.ComponentSFivePlug" type="component-s5">
+%%       for name, value in value.items()
+%%         if name != 'tags'
+            <property name="{{ name }}">{{ value }}</property>
+%%         else
+            <property name="tags">{{ value|join(', ') }}</property>
+%%         endif
+%%       endfor
+          </plug>
+%%     endif
+%%   endfor
+        </plugs>
+%% endif
+%% for name, value in component.properties.items()
+%%   if name != 'samplerate'
+        <property name="{{ name }}">{{ value }}</property>
+%%   endif
+%% endfor
+        <clock-master>false</clock-master>
+    </component>
diff --git a/templates/default/flumotion/mjpeg-encode.xml b/templates/default/flumotion/mjpeg-encode.xml
deleted file mode 100644
index da8947e..0000000
--- a/templates/default/flumotion/mjpeg-encode.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-    <component name="{{ name }}"
-               type="pipeline-converter"
-               label="{{ component.desc }}"
-               worker="{{ component.worker }}"
-               project="flumotion"
-               version="{{ globals.version }}">
-        <eater name="default">
-          <feed alias="default">{{ component.feeder }}</feed>
-        </eater>
-        <property name="pipeline">ffmpegcolorspace ! jpegenc quality={{ component.properties['bitrate'] }} idct-method=float</property>
-        <clock-master>false</clock-master>
-    </component>
diff --git a/templates/default/flumotion/mjpeg-encode.xml.j2 b/templates/default/flumotion/mjpeg-encode.xml.j2
new file mode 100644
index 0000000..da8947e
--- /dev/null
+++ b/templates/default/flumotion/mjpeg-encode.xml.j2
@@ -0,0 +1,12 @@
+    <component name="{{ name }}"
+               type="pipeline-converter"
+               label="{{ component.desc }}"
+               worker="{{ component.worker }}"
+               project="flumotion"
+               version="{{ globals.version }}">
+        <eater name="default">
+          <feed alias="default">{{ component.feeder }}</feed>
+        </eater>
+        <property name="pipeline">ffmpegcolorspace ! jpegenc quality={{ component.properties['bitrate'] }} idct-method=float</property>
+        <clock-master>false</clock-master>
+    </component>
diff --git a/templates/default/flumotion/mkv-mux.xml b/templates/default/flumotion/mkv-mux.xml
deleted file mode 100644
index 0be8da0..0000000
--- a/templates/default/flumotion/mkv-mux.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-    <component name="{{ name }}"
-               type="mkv-muxer"
-               label="{{ component.desc }}"
-               worker="{{ component.worker }}"
-               project="flumotion"
-               version="{{ globals.version }}">
-        <eater name="default">
-          <feed alias="default">{{ component.feeder_audio }}</feed>
-%% if component.feeder_video
-          <feed alias="default-bis">{{ component.feeder_video }}</feed>
-%% endif
-        </eater>
-        <clock-master>false</clock-master>
-    </component>
diff --git a/templates/default/flumotion/mkv-mux.xml.j2 b/templates/default/flumotion/mkv-mux.xml.j2
new file mode 100644
index 0000000..0be8da0
--- /dev/null
+++ b/templates/default/flumotion/mkv-mux.xml.j2
@@ -0,0 +1,14 @@
+    <component name="{{ name }}"
+               type="mkv-muxer"
+               label="{{ component.desc }}"
+               worker="{{ component.worker }}"
+               project="flumotion"
+               version="{{ globals.version }}">
+        <eater name="default">
+          <feed alias="default">{{ component.feeder_audio }}</feed>
+%% if component.feeder_video
+          <feed alias="default-bis">{{ component.feeder_video }}</feed>
+%% endif
+        </eater>
+        <clock-master>false</clock-master>
+    </component>
diff --git a/templates/default/flumotion/mp3-encode.xml b/templates/default/flumotion/mp3-encode.xml
deleted file mode 100644
index 10255df..0000000
--- a/templates/default/flumotion/mp3-encode.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-    <component name="{{ name }}"
-               type="pipeline-converter"
-               label="{{ component.desc }}"
-               worker="{{ component.worker }}"
-               project="flumotion"
-               version="{{ globals.version }}">
-        <eater name="default">
-          <feed alias="default">{{ component.feeder }}</feed>
-        </eater>
-        <property name="pipeline">audioconvert ! lame bitrate={{ component.properties['bitrate'] }}</property>
-        <clock-master>false</clock-master>
-    </component>
diff --git a/templates/default/flumotion/mp3-encode.xml.j2 b/templates/default/flumotion/mp3-encode.xml.j2
new file mode 100644
index 0000000..10255df
--- /dev/null
+++ b/templates/default/flumotion/mp3-encode.xml.j2
@@ -0,0 +1,12 @@
+    <component name="{{ name }}"
+               type="pipeline-converter"
+               label="{{ component.desc }}"
+               worker="{{ component.worker }}"
+               project="flumotion"
+               version="{{ globals.version }}">
+        <eater name="default">
+          <feed alias="default">{{ component.feeder }}</feed>
+        </eater>
+        <property name="pipeline">audioconvert ! lame bitrate={{ component.properties['bitrate'] }}</property>
+        <clock-master>false</clock-master>
+    </component>
diff --git a/templates/default/flumotion/mp3-mux.xml b/templates/default/flumotion/mp3-mux.xml
deleted file mode 100644
index f7ac81d..0000000
--- a/templates/default/flumotion/mp3-mux.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-    <component name="{{ name }}"
-               type="pipeline-converter"
-               label="{{ component.desc }}"
-               worker="{{ component.worker }}"
-               project="flumotion"
-               version="{{ globals.version }}">
-        <eater name="default">
-          <feed alias="default">{{ component.feeder_audio }}</feed>
-        </eater>
-        <property name="pipeline">identity</property>
-        <clock-master>false</clock-master>
-    </component>
diff --git a/templates/default/flumotion/mp3-mux.xml.j2 b/templates/default/flumotion/mp3-mux.xml.j2
new file mode 100644
index 0000000..f7ac81d
--- /dev/null
+++ b/templates/default/flumotion/mp3-mux.xml.j2
@@ -0,0 +1,12 @@
+    <component name="{{ name }}"
+               type="pipeline-converter"
+               label="{{ component.desc }}"
+               worker="{{ component.worker }}"
+               project="flumotion"
+               version="{{ globals.version }}">
+        <eater name="default">
+          <feed alias="default">{{ component.feeder_audio }}</feed>
+        </eater>
+        <property name="pipeline">identity</property>
+        <clock-master>false</clock-master>
+    </component>
diff --git a/templates/default/flumotion/mpeg2-encode.xml b/templates/default/flumotion/mpeg2-encode.xml
deleted file mode 100644
index 05a56c4..0000000
--- a/templates/default/flumotion/mpeg2-encode.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-    <component name="{{ name }}"
-               type="pipeline-converter"
-               label="{{ component.desc }}"
-               worker="{{ component.worker }}"
-               project="flumotion"
-               version="{{ globals.version }}">
-        <eater name="default">
-          <feed alias="default">{{ component.feeder }}</feed>
-        </eater>
-        <property name="pipeline">ffmpegcolorspace ! ffenc_mpeg2video bitrate={{ component.properties['bitrate'] * 1000 }} quantizer=4 gop-size=1</property>
-        <clock-master>false</clock-master>
-    </component>
diff --git a/templates/default/flumotion/mpeg2-encode.xml.j2 b/templates/default/flumotion/mpeg2-encode.xml.j2
new file mode 100644
index 0000000..05a56c4
--- /dev/null
+++ b/templates/default/flumotion/mpeg2-encode.xml.j2
@@ -0,0 +1,12 @@
+    <component name="{{ name }}"
+               type="pipeline-converter"
+               label="{{ component.desc }}"
+               worker="{{ component.worker }}"
+               project="flumotion"
+               version="{{ globals.version }}">
+        <eater name="default">
+          <feed alias="default">{{ component.feeder }}</feed>
+        </eater>
+        <property name="pipeline">ffmpegcolorspace ! ffenc_mpeg2video bitrate={{ component.properties['bitrate'] * 1000 }} quantizer=4 gop-size=1</property>
+        <clock-master>false</clock-master>
+    </component>
diff --git a/templates/default/flumotion/mpegts-mux.xml b/templates/default/flumotion/mpegts-mux.xml
deleted file mode 100644
index 8d8be6a..0000000
--- a/templates/default/flumotion/mpegts-mux.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-    <component name="{{ name }}"
-               type="mpegts-muxer"
-               label="{{ component.desc }}"
-               worker="{{ component.worker }}"
-               project="flumotion"
-               version="{{ globals.version }}">
-        <eater name="default">
-          <feed alias="default">{{ component.feeder_audio }}</feed>
-%% if component.feeder_video
-          <feed alias="default-bis">{{ component.feeder_video }}</feed>
-%% endif
-        </eater>
-        <clock-master>false</clock-master>
-    </component>
diff --git a/templates/default/flumotion/mpegts-mux.xml.j2 b/templates/default/flumotion/mpegts-mux.xml.j2
new file mode 100644
index 0000000..8d8be6a
--- /dev/null
+++ b/templates/default/flumotion/mpegts-mux.xml.j2
@@ -0,0 +1,14 @@
+    <component name="{{ name }}"
+               type="mpegts-muxer"
+               label="{{ component.desc }}"
+               worker="{{ component.worker }}"
+               project="flumotion"
+               version="{{ globals.version }}">
+        <eater name="default">
+          <feed alias="default">{{ component.feeder_audio }}</feed>
+%% if component.feeder_video
+          <feed alias="default-bis">{{ component.feeder_video }}</feed>
+%% endif
+        </eater>
+        <clock-master>false</clock-master>
+    </component>
diff --git a/templates/default/flumotion/ogg-mux.xml b/templates/default/flumotion/ogg-mux.xml
deleted file mode 100644
index 8827be1..0000000
--- a/templates/default/flumotion/ogg-mux.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-    <component name="{{ name }}"
-               type="ogg-muxer"
-               label="{{ component.desc }}"
-               worker="{{ component.worker }}"
-               project="flumotion"
-               version="{{ globals.version }}">
-        <eater name="default">
-          <feed alias="default">{{ component.feeder_audio }}</feed>
-%% if component.feeder_video
-          <feed alias="default-bis">{{ component.feeder_video }}</feed>
-%% endif
-        </eater>
-        <clock-master>false</clock-master>
-    </component>
diff --git a/templates/default/flumotion/ogg-mux.xml.j2 b/templates/default/flumotion/ogg-mux.xml.j2
new file mode 100644
index 0000000..8827be1
--- /dev/null
+++ b/templates/default/flumotion/ogg-mux.xml.j2
@@ -0,0 +1,14 @@
+    <component name="{{ name }}"
+               type="ogg-muxer"
+               label="{{ component.desc }}"
+               worker="{{ component.worker }}"
+               project="flumotion"
+               version="{{ globals.version }}">
+        <eater name="default">
+          <feed alias="default">{{ component.feeder_audio }}</feed>
+%% if component.feeder_video
+          <feed alias="default-bis">{{ component.feeder_video }}</feed>
+%% endif
+        </eater>
+        <clock-master>false</clock-master>
+    </component>
diff --git a/templates/default/flumotion/opus-encode.xml b/templates/default/flumotion/opus-encode.xml
deleted file mode 100644
index 531bd84..0000000
--- a/templates/default/flumotion/opus-encode.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-    <component name="{{ name }}"
-               type="pipeline-converter"
-               label="{{ component.desc }}"
-               worker="{{ component.worker }}"
-               project="flumotion"
-               version="{{ globals.version }}">
-        <eater name="default">
-          <feed alias="default">{{ component.feeder }}</feed>
-        </eater>
-        <property name="pipeline">audioconvert ! opusenc audio=true bitrate={{ component.properties['bitrate'] * 1000 }}</property>
-        <clock-master>false</clock-master>
-    </component>
diff --git a/templates/default/flumotion/opus-encode.xml.j2 b/templates/default/flumotion/opus-encode.xml.j2
new file mode 100644
index 0000000..531bd84
--- /dev/null
+++ b/templates/default/flumotion/opus-encode.xml.j2
@@ -0,0 +1,12 @@
+    <component name="{{ name }}"
+               type="pipeline-converter"
+               label="{{ component.desc }}"
+               worker="{{ component.worker }}"
+               project="flumotion"
+               version="{{ globals.version }}">
+        <eater name="default">
+          <feed alias="default">{{ component.feeder }}</feed>
+        </eater>
+        <property name="pipeline">audioconvert ! opusenc audio=true bitrate={{ component.properties['bitrate'] * 1000 }}</property>
+        <clock-master>false</clock-master>
+    </component>
diff --git a/templates/default/flumotion/planet.xml b/templates/default/flumotion/planet.xml
deleted file mode 100644
index 9c4e31a..0000000
--- a/templates/default/flumotion/planet.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<planet name="{{ globals.name }}">
-
-  <manager name="{{ globals.name }}">
-%% for name, value in globals.manager.items()
-%%   if name != 'machine'
-    <{{ name }}>{{ value }}</{{ name }}>
-%%   endif
-%% endfor
-    <component name="manager-bouncer" type="htpasswdcrypt-bouncer">
-      <property name="filename">/etc/flumotion/{{ globals.name }}.passwd</property>
-    </component>
-  </manager>
-
-  <atmosphere>
-{% for name, component in atmosphere.items() %}
-{% include '%s.xml' % component.type %}
-{% endfor %}
-  </atmosphere>
-
-  <flow name="{{ globals.name }}">
-<!-- raw-input, resizing and resampling -->
-{% for name, component in flow['inputs'].items() %}
-{% include '%s.xml' % component.type %}
-{% endfor %}
-
-<!-- encoding -->
-  <!-- audio -->
-{% for name, component in flow['encoders-audio'].items() %}
-{% include '%s.xml' % component.type %}
-{% endfor %}
-  <!-- video -->
-{% for name, component in flow['encoders-video'].items() %}
-{% include '%s.xml' % component.type %}
-{% endfor %}
-
-<!-- muxing -->
-{% for name, component in flow['muxers'].items() %}
-{% include '%s.xml' % component.type %}
-{% endfor %}
-
-<!-- repeater -->
-{% for name, component in flow['repeaters'].items() %}
-{% include '%s.xml' % component.type %}
-{% endfor %}
-
-<!-- streaming -->
-{% for name, component in flow['streamers'].items() %}
-{% include '%s.xml' % component.type %}
-{% endfor %}
-
-<!-- recording -->
-{% for name, component in flow['recorders'].items() %}
-{% include '%s.xml' % component.type %}
-{% endfor %}
-  </flow>
-
-</planet>
diff --git a/templates/default/flumotion/planet.xml.j2 b/templates/default/flumotion/planet.xml.j2
new file mode 100644
index 0000000..2f99c0e
--- /dev/null
+++ b/templates/default/flumotion/planet.xml.j2
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<planet name="{{ globals.name }}">
+
+  <manager name="{{ globals.name }}">
+%% for name, value in globals.manager.items()
+%%   if name != 'machine'
+    <{{ name }}>{{ value }}</{{ name }}>
+%%   endif
+%% endfor
+    <component name="manager-bouncer" type="htpasswdcrypt-bouncer">
+      <property name="filename">/etc/flumotion/{{ globals.name }}.passwd</property>
+    </component>
+  </manager>
+
+  <atmosphere>
+{% for name, component in atmosphere.items() %}
+{% include '%s.xml.j2' % component.type %}
+{% endfor %}
+  </atmosphere>
+
+  <flow name="{{ globals.name }}">
+<!-- raw-input, resizing and resampling -->
+{% for name, component in flow['inputs'].items() %}
+{% include '%s.xml.j2' % component.type %}
+{% endfor %}
+
+<!-- encoding -->
+  <!-- audio -->
+{% for name, component in flow['encoders-audio'].items() %}
+{% include '%s.xml.j2' % component.type %}
+{% endfor %}
+  <!-- video -->
+{% for name, component in flow['encoders-video'].items() %}
+{% include '%s.xml.j2' % component.type %}
+{% endfor %}
+
+<!-- muxing -->
+{% for name, component in flow['muxers'].items() %}
+{% include '%s.xml.j2' % component.type %}
+{% endfor %}
+
+<!-- repeater -->
+{% for name, component in flow['repeaters'].items() %}
+{% include '%s.xml.j2' % component.type %}
+{% endfor %}
+
+<!-- streaming -->
+{% for name, component in flow['streamers'].items() %}
+{% include '%s.xml.j2' % component.type %}
+{% endfor %}
+
+<!-- recording -->
+{% for name, component in flow['recorders'].items() %}
+{% include '%s.xml.j2' % component.type %}
+{% endfor %}
+  </flow>
+
+</planet>
diff --git a/templates/default/flumotion/porter.xml b/templates/default/flumotion/porter.xml
deleted file mode 100644
index 86b72b3..0000000
--- a/templates/default/flumotion/porter.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-    <component name="{{ name }}"
-               type="porter"
-               label="{{ component.desc }}"
-               worker="{{ component.worker }}"
-               project="flumotion"
-               version="{{ globals.version }}">
-%% for name, value in component.properties.items()
-      <property name="{{ name }}">{{ value }}</property>
-%% endfor
-    </component>
diff --git a/templates/default/flumotion/porter.xml.j2 b/templates/default/flumotion/porter.xml.j2
new file mode 100644
index 0000000..86b72b3
--- /dev/null
+++ b/templates/default/flumotion/porter.xml.j2
@@ -0,0 +1,10 @@
+    <component name="{{ name }}"
+               type="porter"
+               label="{{ component.desc }}"
+               worker="{{ component.worker }}"
+               project="flumotion"
+               version="{{ globals.version }}">
+%% for name, value in component.properties.items()
+      <property name="{{ name }}">{{ value }}</property>
+%% endfor
+    </component>
diff --git a/templates/default/flumotion/raw-encode.xml b/templates/default/flumotion/raw-encode.xml
deleted file mode 100644
index c5e1c61..0000000
--- a/templates/default/flumotion/raw-encode.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-    <component name="{{ name }}"
-               type="pipeline-converter"
-               label="{{ component.desc }}"
-               worker="{{ component.worker }}"
-               project="flumotion"
-               version="{{ globals.version }}">
-        <eater name="default">
-          <feed alias="default">{{ component.feeder }}</feed>
-        </eater>
-        <property name="pipeline">identity</property>
-        <clock-master>false</clock-master>
-    </component>
diff --git a/templates/default/flumotion/raw-encode.xml.j2 b/templates/default/flumotion/raw-encode.xml.j2
new file mode 100644
index 0000000..c5e1c61
--- /dev/null
+++ b/templates/default/flumotion/raw-encode.xml.j2
@@ -0,0 +1,12 @@
+    <component name="{{ name }}"
+               type="pipeline-converter"
+               label="{{ component.desc }}"
+               worker="{{ component.worker }}"
+               project="flumotion"
+               version="{{ globals.version }}">
+        <eater name="default">
+          <feed alias="default">{{ component.feeder }}</feed>
+        </eater>
+        <property name="pipeline">identity</property>
+        <clock-master>false</clock-master>
+    </component>
diff --git a/templates/default/flumotion/recorder.xml b/templates/default/flumotion/recorder.xml
deleted file mode 100644
index b2fce9e..0000000
--- a/templates/default/flumotion/recorder.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-    <component name="{{ name }}"
-               type="disk-consumer"
-               label="{{ component.desc }}"
-               worker="{{ component.worker }}"
-               project="flumotion"
-               version="{{ globals.version }}">
-        <eater name="default">
-          <feed alias="default">{{ component.feeder }}</feed>
-        </eater>
-%% for name, value in component.properties.items()
-        <property name="{{ name }}">{{ value }}</property>
-%% endfor
-        <clock-master>false</clock-master>
-    </component>
diff --git a/templates/default/flumotion/recorder.xml.j2 b/templates/default/flumotion/recorder.xml.j2
new file mode 100644
index 0000000..b2fce9e
--- /dev/null
+++ b/templates/default/flumotion/recorder.xml.j2
@@ -0,0 +1,14 @@
+    <component name="{{ name }}"
+               type="disk-consumer"
+               label="{{ component.desc }}"
+               worker="{{ component.worker }}"
+               project="flumotion"
+               version="{{ globals.version }}">
+        <eater name="default">
+          <feed alias="default">{{ component.feeder }}</feed>
+        </eater>
+%% for name, value in component.properties.items()
+        <property name="{{ name }}">{{ value }}</property>
+%% endfor
+        <clock-master>false</clock-master>
+    </component>
diff --git a/templates/default/flumotion/repeater.xml b/templates/default/flumotion/repeater.xml
deleted file mode 100644
index aa469ec..0000000
--- a/templates/default/flumotion/repeater.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-    <component name="{{ name }}"
-               type="repeater"
-               label="{{ component.desc }}"
-               worker="{{ component.worker }}"
-               project="flumotion"
-               version="{{ globals.version }}">
-        <eater name="default">
-          <feed alias="default">{{ component.feeder }}</feed>
-        </eater>
-        <clock-master>false</clock-master>
-    </component>
diff --git a/templates/default/flumotion/repeater.xml.j2 b/templates/default/flumotion/repeater.xml.j2
new file mode 100644
index 0000000..aa469ec
--- /dev/null
+++ b/templates/default/flumotion/repeater.xml.j2
@@ -0,0 +1,11 @@
+    <component name="{{ name }}"
+               type="repeater"
+               label="{{ component.desc }}"
+               worker="{{ component.worker }}"
+               project="flumotion"
+               version="{{ globals.version }}">
+        <eater name="default">
+          <feed alias="default">{{ component.feeder }}</feed>
+        </eater>
+        <clock-master>false</clock-master>
+    </component>
diff --git a/templates/default/flumotion/soundcard.xml b/templates/default/flumotion/soundcard.xml
deleted file mode 100644
index 23df8a4..0000000
--- a/templates/default/flumotion/soundcard.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-    <component name="{{ name }}_raw"
-               type="soundcard-producer"
-               label="{{ component.desc }} (raw)"
-               worker="{{ component.worker }}"
-               project="flumotion"
-               version="{{ globals.version }}">
-%% for name, value in component.properties.items()
-        <property name="{{ name }}">{{ value }}</property>
-%% endfor
-        <clock-master>{{ component.master }}</clock-master>
-    </component>
-
-    <component name="{{ name }}"
-               type="pipeline-converter"
-               label="{{ component.desc }} (normalized)"
-               worker="{{ component.worker }}"
-               project="flumotion"
-               version="{{ globals.version }}">
-        <eater name="default">
-          <feed alias="default">{{ name }}_raw</feed>
-        </eater>
-        <property name="pipeline">audioconvert ! audio/x-raw-int,rate=(int)48000,width=16,depth=16,channels=2</property>
-        <clock-master>false</clock-master>
-    </component>
diff --git a/templates/default/flumotion/soundcard.xml.j2 b/templates/default/flumotion/soundcard.xml.j2
new file mode 100644
index 0000000..23df8a4
--- /dev/null
+++ b/templates/default/flumotion/soundcard.xml.j2
@@ -0,0 +1,24 @@
+    <component name="{{ name }}_raw"
+               type="soundcard-producer"
+               label="{{ component.desc }} (raw)"
+               worker="{{ component.worker }}"
+               project="flumotion"
+               version="{{ globals.version }}">
+%% for name, value in component.properties.items()
+        <property name="{{ name }}">{{ value }}</property>
+%% endfor
+        <clock-master>{{ component.master }}</clock-master>
+    </component>
+
+    <component name="{{ name }}"
+               type="pipeline-converter"
+               label="{{ component.desc }} (normalized)"
+               worker="{{ component.worker }}"
+               project="flumotion"
+               version="{{ globals.version }}">
+        <eater name="default">
+          <feed alias="default">{{ name }}_raw</feed>
+        </eater>
+        <property name="pipeline">audioconvert ! audio/x-raw-int,rate=(int)48000,width=16,depth=16,channels=2</property>
+        <clock-master>false</clock-master>
+    </component>
diff --git a/templates/default/flumotion/video-resize.xml b/templates/default/flumotion/video-resize.xml
deleted file mode 100644
index 7f858b9..0000000
--- a/templates/default/flumotion/video-resize.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-    <component name="{{ name }}"
-               type="pipeline-converter"
-               label="{{ component.desc }}"
-               worker="{{ component.worker }}"
-               project="flumotion"
-               version="{{ globals.version }}">
-        <eater name="default">
-          <feed alias="default">{{ component.feeder }}</feed>
-        </eater>
-        <property name="pipeline">videoscale method=lanczos ! video/x-raw-yuv,width={{ component.properties['width'] }},height={{ component.properties['height'] }}</property>
-        <clock-master>false</clock-master>
-    </component>
diff --git a/templates/default/flumotion/video-resize.xml.j2 b/templates/default/flumotion/video-resize.xml.j2
new file mode 100644
index 0000000..7f858b9
--- /dev/null
+++ b/templates/default/flumotion/video-resize.xml.j2
@@ -0,0 +1,12 @@
+    <component name="{{ name }}"
+               type="pipeline-converter"
+               label="{{ component.desc }}"
+               worker="{{ component.worker }}"
+               project="flumotion"
+               version="{{ globals.version }}">
+        <eater name="default">
+          <feed alias="default">{{ component.feeder }}</feed>
+        </eater>
+        <property name="pipeline">videoscale method=lanczos ! video/x-raw-yuv,width={{ component.properties['width'] }},height={{ component.properties['height'] }}</property>
+        <clock-master>false</clock-master>
+    </component>
diff --git a/templates/default/flumotion/videotest.xml b/templates/default/flumotion/videotest.xml
deleted file mode 100644
index 342d645..0000000
--- a/templates/default/flumotion/videotest.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-    <component name="{{ name }}"
-               type="videotest-producer"
-               label="{{ component.desc }}"
-               worker="{{ component.worker }}"
-               project="flumotion"
-               version="{{ globals.version }}">
-%% for name, value in component.properties.items()
-        <property name="{{ name }}">{{ value }}</property>
-%% endfor
-        <clock-master>{{ component.master }}</clock-master>
-    </component>
diff --git a/templates/default/flumotion/videotest.xml.j2 b/templates/default/flumotion/videotest.xml.j2
new file mode 100644
index 0000000..342d645
--- /dev/null
+++ b/templates/default/flumotion/videotest.xml.j2
@@ -0,0 +1,11 @@
+    <component name="{{ name }}"
+               type="videotest-producer"
+               label="{{ component.desc }}"
+               worker="{{ component.worker }}"
+               project="flumotion"
+               version="{{ globals.version }}">
+%% for name, value in component.properties.items()
+        <property name="{{ name }}">{{ value }}</property>
+%% endfor
+        <clock-master>{{ component.master }}</clock-master>
+    </component>
diff --git a/templates/default/flumotion/vorbis-encode.xml b/templates/default/flumotion/vorbis-encode.xml
deleted file mode 100644
index 83471fd..0000000
--- a/templates/default/flumotion/vorbis-encode.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-    <component name="{{ name }}"
-               type="vorbis-encoder"
-               label="{{ component.desc }}"
-               worker="{{ component.worker }}"
-               project="flumotion"
-               version="{{ globals.version }}">
-        <eater name="default">
-          <feed alias="default">{{ component.feeder }}</feed>
-        </eater>
-        <property name="bitrate">{{ component.properties['bitrate'] * 1000 }}</property>
-        <clock-master>false</clock-master>
-    </component>
diff --git a/templates/default/flumotion/vorbis-encode.xml.j2 b/templates/default/flumotion/vorbis-encode.xml.j2
new file mode 100644
index 0000000..83471fd
--- /dev/null
+++ b/templates/default/flumotion/vorbis-encode.xml.j2
@@ -0,0 +1,12 @@
+    <component name="{{ name }}"
+               type="vorbis-encoder"
+               label="{{ component.desc }}"
+               worker="{{ component.worker }}"
+               project="flumotion"
+               version="{{ globals.version }}">
+        <eater name="default">
+          <feed alias="default">{{ component.feeder }}</feed>
+        </eater>
+        <property name="bitrate">{{ component.properties['bitrate'] * 1000 }}</property>
+        <clock-master>false</clock-master>
+    </component>
diff --git a/templates/default/flumotion/vp8-encode.xml b/templates/default/flumotion/vp8-encode.xml
deleted file mode 100644
index 79dfdc9..0000000
--- a/templates/default/flumotion/vp8-encode.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-    <component name="{{ name }}"
-               type="pipeline-converter"
-               label="{{ component.desc }}"
-               worker="{{ component.worker }}"
-               project="flumotion"
-               version="{{ globals.version }}">
-        <eater name="default">
-          <feed alias="default">{{ component.feeder }}</feed>
-        </eater>
-        <property name="pipeline">ffmpegcolorspace ! vp8enc bitrate={{ component.properties['bitrate'] * 1000 }} threads=8 max-keyframe-distance=50 speed=5 mode=1</property>
-        <clock-master>false</clock-master>
-    </component>
diff --git a/templates/default/flumotion/vp8-encode.xml.j2 b/templates/default/flumotion/vp8-encode.xml.j2
new file mode 100644
index 0000000..dfb07d7
--- /dev/null
+++ b/templates/default/flumotion/vp8-encode.xml.j2
@@ -0,0 +1,12 @@
+    <component name="{{ name }}"
+               type="pipeline-converter"
+               label="{{ component.desc }}"
+               worker="{{ component.worker }}"
+               project="flumotion"
+               version="{{ globals.version }}">
+        <eater name="default">
+          <feed alias="default">{{ component.feeder }}</feed>
+        </eater>
+        <property name="pipeline">ffmpegcolorspace ! vp8enc bitrate={{ component.properties['bitrate'] * 1000 }} threads=8 max-keyframe-distance=50 speed=5 mode=1</property>
+        <clock-master>false</clock-master>
+    </component>
diff --git a/templates/default/flumotion/webm-mux.xml b/templates/default/flumotion/webm-mux.xml
deleted file mode 100644
index ac58f13..0000000
--- a/templates/default/flumotion/webm-mux.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-    <component name="{{ name }}"
-               type="webm-muxer"
-               label="{{ component.desc }}"
-               worker="{{ component.worker }}"
-               project="flumotion"
-               version="{{ globals.version }}">
-        <eater name="default">
-          <feed alias="default">{{ component.feeder_audio }}</feed>
-%% if component.feeder_video
-          <feed alias="default-bis">{{ component.feeder_video }}</feed>
-%% endif
-        </eater>
-        <clock-master>false</clock-master>
-    </component>
diff --git a/templates/default/flumotion/webm-mux.xml.j2 b/templates/default/flumotion/webm-mux.xml.j2
new file mode 100644
index 0000000..ac58f13
--- /dev/null
+++ b/templates/default/flumotion/webm-mux.xml.j2
@@ -0,0 +1,14 @@
+    <component name="{{ name }}"
+               type="webm-muxer"
+               label="{{ component.desc }}"
+               worker="{{ component.worker }}"
+               project="flumotion"
+               version="{{ globals.version }}">
+        <eater name="default">
+          <feed alias="default">{{ component.feeder_audio }}</feed>
+%% if component.feeder_video
+          <feed alias="default-bis">{{ component.feeder_video }}</feed>
+%% endif
+        </eater>
+        <clock-master>false</clock-master>
+    </component>
diff --git a/templates/default/flumotion/worker.xml b/templates/default/flumotion/worker.xml
deleted file mode 100644
index b6f4667..0000000
--- a/templates/default/flumotion/worker.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-<worker name="{{ name }}">
-    <manager>
-%% for name, value in globals.manager.items()
-%%   if name != 'machine'
-       <{{ name }}>{{ value }}</{{ name }}>
-%%   endif
-%% endfor
-    </manager>
-
-    <authentication type="plaintext">
-      <username>{{ name }}</username>
-      <password>{{ password }}</password>
-    </authentication>
-
-    <feederports>{{ portrange }}</feederports>
-%% if debug and debug != ''
-    <debug>{{ debug }}</debug>
-%% endif
-</worker>
diff --git a/templates/default/flumotion/worker.xml.j2 b/templates/default/flumotion/worker.xml.j2
new file mode 100644
index 0000000..b6f4667
--- /dev/null
+++ b/templates/default/flumotion/worker.xml.j2
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<worker name="{{ name }}">
+    <manager>
+%% for name, value in globals.manager.items()
+%%   if name != 'machine'
+       <{{ name }}>{{ value }}</{{ name }}>
+%%   endif
+%% endfor
+    </manager>
+
+    <authentication type="plaintext">
+      <username>{{ name }}</username>
+      <password>{{ password }}</password>
+    </authentication>
+
+    <feederports>{{ portrange }}</feederports>
+%% if debug and debug != ''
+    <debug>{{ debug }}</debug>
+%% endif
+</worker>
diff --git a/templates/default/kubernetes/flumotion-manager-cm.yml.j2 b/templates/default/kubernetes/flumotion-manager-cm.yml.j2
new file mode 100644
index 0000000..d29cff6
--- /dev/null
+++ b/templates/default/kubernetes/flumotion-manager-cm.yml.j2
@@ -0,0 +1,23 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  namespace: {{ namespace }}
+  name: flumotion-manager
+  labels:
+    app: flumotion
+    type: manager
+data:
+  planet.xml: |
+    <?xml version="1.0"?>
+    <planet>
+      <manager name="planet">
+        <host>0.0.0.0</host>
+        <port>8642</port>
+        <transport>tcp</transport>
+        <component name="manager-bouncer" type="htpasswdcrypt-bouncer">
+          <property name="data">
+    user:PSfNpHTkpTx1M
+          </property>
+        </component>
+      </manager>
+    </planet>
diff --git a/templates/default/kubernetes/flumotion-manager-deploy.yml.j2 b/templates/default/kubernetes/flumotion-manager-deploy.yml.j2
new file mode 100644
index 0000000..4d86e89
--- /dev/null
+++ b/templates/default/kubernetes/flumotion-manager-deploy.yml.j2
@@ -0,0 +1,43 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  namespace: {{ namespace }}
+  name: flumotion-manager
+  labels:
+    app: flumotion
+    type: manager
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: flumotion
+      type: manager
+  strategy:
+    type: Recreate
+  revisionHistoryLimit: 5
+  template:
+    metadata:
+      labels:
+        app: flumotion
+        type: manager
+    spec:
+      nodeName: dione
+      containers:
+      - name: flumotion
+        image: spreadspace/flumotion:manager
+        imagePullPolicy: Always
+        args:
+        - --verbose
+        - /etc/flumotion/planet.xml
+        volumeMounts:
+        - name: home
+          mountPath: /srv
+        - name: planet-config
+          mountPath: /etc/flumotion
+      volumes:
+      - name: home
+        emptyDir:
+          medium: Memory
+      - name: planet-config
+        configMap:
+          name: flumotion-manager
diff --git a/templates/default/kubernetes/flumotion-manager-svc.yml.j2 b/templates/default/kubernetes/flumotion-manager-svc.yml.j2
new file mode 100644
index 0000000..5d0dac7
--- /dev/null
+++ b/templates/default/kubernetes/flumotion-manager-svc.yml.j2
@@ -0,0 +1,20 @@
+apiVersion: v1
+kind: Service
+metadata:
+  namespace: {{ namespace }}
+  name: flumotion-manager
+  labels:
+    app: flumotion
+    type: manager
+spec:
+  selector:
+    app: flumotion
+    type: manager
+  clusterIP: {{ desc.globals.manager.host }}
+  ports:
+  - name: ssl
+    port: 7531
+    protocol: TCP
+  - name: plain
+    port: 8642
+    protocol: TCP
diff --git a/templates/default/kubernetes/flumotion-worker-deploy.yml.j2 b/templates/default/kubernetes/flumotion-worker-deploy.yml.j2
new file mode 100644
index 0000000..ea040d0
--- /dev/null
+++ b/templates/default/kubernetes/flumotion-worker-deploy.yml.j2
@@ -0,0 +1,61 @@
+apiVersion: apps/v1beta2
+kind: Deployment
+metadata:
+  namespace: {{ namespace }}
+  name: flumotion-worker-{{ worker_name }}
+  labels:
+    app: flumotion
+    type: worker
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: flumotion
+      type: worker
+  strategy:
+    type: Recreate
+  revisionHistoryLimit: 5
+  template:
+    metadata:
+      labels:
+        app: flumotion
+        type: worker
+    spec:
+      nodeName: dione
+      containers:
+      - name: flumotion
+        image: spreadspace/flumotion:worker
+        imagePullPolicy: Always
+        args:
+        - --verbose
+        - -H flumotion-manager
+        - -P 8642
+        - -T tcp
+        - -n {{ worker_name }}
+        - -u user
+        - -p test
+        securityContext:
+          privileged: true
+        volumeMounts:
+        - name: home
+          mountPath: /srv
+        - name: decklink-devices
+          mountPath: /dev/blackmagic
+        - name: decklink-libs
+          subPath: libDeckLinkAPI.so
+          mountPath: /usr/lib/libDeckLinkAPI.so
+        - name: decklink-libs
+          subPath: libDeckLinkPreviewAPI.so
+          mountPath: /usr/lib/libDeckLinkPreviewAPI.so
+      volumes:
+      - name: home
+        emptyDir:
+          medium: Memory
+      - name: decklink-devices
+        hostPath:
+          type: Directory
+          path: /dev/blackmagic
+      - name: decklink-libs
+        hostPath:
+          type: Directory
+          path: /usr/lib/
-- 
cgit v1.2.3