change handling of flags

3 files changed, 16 insertions, 12 deletions

diff --git a/templates/default/flumotion/planet.xml.j2 b/templates/default/flumotion/planet.xml.j2
index cac9fc0..5c2575c 100644
--- a/templates/default/flumotion/planet.xml.j2
+++ b/templates/default/flumotion/planet.xml.j2
@@ -2,19 +2,19 @@
 <planet name="{{ globals.name }}">
 
   <manager name="{{ globals.name }}">
-{%- if globals.deployment.type == "kubernetes" %}
+%% if globals.deployment.type == "kubernetes"
     <host>0.0.0.0</host>
-{%- else %}
+%% else
     <host>{{ globals.manager.host }}</host>
-{%- endif %}
+%% endif
     <port>{{ globals.manager.port }}</port>
     <transport>{{ globals.manager.transport }}</transport>
     <component name="manager-bouncer" type="htpasswdcrypt-bouncer">
-{%- if globals.deployment.type == "kubernetes" %}
+%% if globals.deployment.type == "kubernetes"
       <property name="filename">/srv/secret/htpasswd</property>
-{%- else %}
+%% else
       <property name="filename">/etc/flumotion/{{ globals.name }}.passwd</property>
-{%- endif %}
+%% endif
     </component>
   </manager>
 
diff --git a/templates/default/flumotion/recorder.xml.j2 b/templates/default/flumotion/recorder.xml.j2
index b2fce9e..2634978 100644
--- a/templates/default/flumotion/recorder.xml.j2
+++ b/templates/default/flumotion/recorder.xml.j2
@@ -8,7 +8,11 @@
           <feed alias="default">{{ component.feeder }}</feed>
         </eater>
 %% for name, value in component.properties.items()
+%%   if globals.deployment.type == "kubernetes" and name == "directory"
+        <property name="{{ name }}">/srv/recordings/{{ component._recorder_id }}</property>
+%%   else
         <property name="{{ name }}">{{ value }}</property>
+%%   endif
 %% endfor
         <clock-master>false</clock-master>
     </component>
diff --git a/templates/default/kubernetes/flumotion-worker-deploy.yml.j2 b/templates/default/kubernetes/flumotion-worker-deploy.yml.j2
index 9098866..1c5c003 100644
--- a/templates/default/kubernetes/flumotion-worker-deploy.yml.j2
+++ b/templates/default/kubernetes/flumotion-worker-deploy.yml.j2
@@ -26,7 +26,7 @@ spec:
         runAsUser: 998
         fsGroup: 998
       containers:
-{% for subname, sub in worker.subs.items() %}
+%% for subname, sub in worker.subs.items()
       - name: {{ subname }}
         image: spreadspace/flumotion:worker-{{ desc.globals.deployment.parameter.image_version }}
         imagePullPolicy: Always
@@ -48,7 +48,7 @@ spec:
         volumeMounts:
         - name: home
           mountPath: /srv
-{% if 'input-decklink' in sub.flags %}
+%%   if 'input-decklink' in sub.flags
         - name: decklink-devices
           mountPath: /dev/blackmagic
         - name: decklink-libs
@@ -59,13 +59,13 @@ spec:
           mountPath: /usr/lib/libDeckLinkPreviewAPI.so
         securityContext:
           privileged: true
-{% endif %}
-{% endfor %}
+%%   endif
+%% endfor
       volumes:
       - name: home
         emptyDir:
           medium: Memory
-{% if 'input-decklink' in worker.flags %}
+%% if 'input-decklink' in worker.flags
       - name: decklink-devices
         hostPath:
           type: Directory
@@ -74,4 +74,4 @@ spec:
         hostPath:
           type: Directory
           path: /usr/lib/
-{% endif %}
+%% endif