diff options
Diffstat (limited to 'templates/default')
| -rw-r--r-- | templates/default/flumotion/planet.xml.j2 | 5 | ||||
| -rw-r--r-- | templates/default/kubernetes/flumotion-worker-deploy.yml.j2 | 8 |
2 files changed, 8 insertions, 5 deletions
diff --git a/templates/default/flumotion/planet.xml.j2 b/templates/default/flumotion/planet.xml.j2 index 881a5ff..0a86b30 100644 --- a/templates/default/flumotion/planet.xml.j2 +++ b/templates/default/flumotion/planet.xml.j2 @@ -7,7 +7,10 @@ <port>{{ globals.manager.port }}</port> <transport>{{ globals.manager.transport }}</transport> <component name="manager-bouncer" type="htpasswdcrypt-bouncer"> - <property name="filename">/etc/flumotion/{{ globals.name }}.passwd</property> +<!-- <property name="filename">/etc/flumotion/{{ globals.name }}.passwd</property> --> + <property name="data"> + user:PSfNpHTkpTx1M + </property> </component> </manager> diff --git a/templates/default/kubernetes/flumotion-worker-deploy.yml.j2 b/templates/default/kubernetes/flumotion-worker-deploy.yml.j2 index 8504b34..778aa06 100644 --- a/templates/default/kubernetes/flumotion-worker-deploy.yml.j2 +++ b/templates/default/kubernetes/flumotion-worker-deploy.yml.j2 @@ -2,7 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: namespace: {{ namespace }} - name: flumotion-worker-{{ worker_name }} + name: flumotion-worker-{{ worker.name }} labels: app: flumotion type: worker @@ -21,9 +21,9 @@ spec: app: flumotion type: worker spec: - nodeName: {{ worker_name }} + nodeName: {{ worker.name }} containers: -{% for subname in worker_subnames %} +{% for subname, sub in worker.subs.items() %} - name: {{ subname }} image: spreadspace/flumotion:worker imagePullPolicy: Always @@ -32,7 +32,7 @@ spec: - -H flumotion-manager - -P 8642 - -T tcp - - -n {{ worker_name }}:{{ subname }} + - -n {{ sub.fullname }} - -u user - -p test - -F {{ 8000 + loop.index0 * 10 }}-{{ 8001 + loop.index0 * 10 }} |