Commit 9a71065a authored by Markus Scheidgen's avatar Markus Scheidgen
Browse files

Made worker routing the default for migration.

parent 09dea5a5
Subproject commit 5f97f32086c281ebda5ab6084ae2c7eba16b516f
Subproject commit 3b199d1f17f9cdf94e08fc5a3b46e2895147463d
Subproject commit 0feea3bb5aeb2847cde41c4d642c6b5af8e38cd5
Subproject commit 7505b8b16035ec22025875bb6dfbe22f812ddcdd
Subproject commit 3811ced85fb7d68ca579d5ca8d93e800f48c53a5
Subproject commit 4802d6d8ab942d2431a39d37e2ffefaf5c6ef478
Subproject commit d8ee02926a9f37317c880ba3caa31f5140e7730e
Subproject commit 0e0c20ab4adea61ad31f8a7e96876434008fb490
......@@ -145,7 +145,7 @@ spec:
path: {{ .Values.volumes.public }}
type: Directory
- name: staging-volume
{{ if (eq .Values.worker.routing "worker") }}
{{ if (eq .Values.worker.storage "memory") }}
emptyDir:
medium: 'Memory'
{{ else }}
......
......@@ -47,4 +47,7 @@ data:
user: "{{ .Values.mail.user }}"
password: "{{ .Values.mail.password }}"
from_address: "{{ .Values.mail.from }}"
celery_routing: "{{ .Values.worker.routing }}"
celery:
routing: "{{ .Values.worker.routing }}"
timeout: 7200
......@@ -79,7 +79,7 @@ spec:
path: {{ .Values.volumes.public }}
type: Directory
- name: staging-volume
{{ if (eq .Values.worker.routing "worker") }}
{{ if (eq .Values.worker.storage "memory") }}
emptyDir:
medium: 'Memory'
{{ else }}
......
......@@ -49,6 +49,7 @@ worker:
console_loglevel: INFO
logstash_loglevel: INFO
routing: "queue"
storage: "disk"
## Everthing concerning the nomad gui
gui:
......
......@@ -4,6 +4,9 @@ proxy:
host: "labdev-nomad.esc.rzg.mpg.de"
path: "/fairdi/nomad/migration"
api:
disableReset: false
worker:
replicas: 3
routing: "worker"
......@@ -15,6 +18,6 @@ uploadurl: 'https://labdev-nomad.rzg.mpg.de/fairdi/nomad/migration/upload'
volumes:
prefixSize: 2
public: /nomad/fairdi/migration/fs/public
staging: /nomad/fairdi/migration/fs/staging
staging: /scratch/fairdi/migration/fs/staging
tmp: /nomad/fairdi/migration/fs/tmp
nomad: /nomad
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment