Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
nomad-FAIR
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
nomad-lab
nomad-FAIR
Commits
c1be7695
Commit
c1be7695
authored
6 years ago
by
Markus Scheidgen
Browse files
Options
Downloads
Plain Diff
Merge branch 'migration' of gitlab.mpcdf.mpg.de:nomad-lab/nomad-FAIR into migration
parents
f16890d2
e649a4c5
No related branches found
No related tags found
1 merge request
!34
Merged latest changes torwards 4.2.
Pipeline
#44804
failed
6 years ago
Stage: build
Stage: test
Stage: release
Stage: deploy
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
ops/helm/nomad/templates/worker-deployment.yaml
+3
-1
3 additions, 1 deletion
ops/helm/nomad/templates/worker-deployment.yaml
ops/helm/nomad/values.yaml
+1
-1
1 addition, 1 deletion
ops/helm/nomad/values.yaml
ops/migration_client.env.sh
+4
-0
4 additions, 0 deletions
ops/migration_client.env.sh
with
8 additions
and
2 deletions
ops/helm/nomad/templates/worker-deployment.yaml
+
3
−
1
View file @
c1be7695
...
...
@@ -77,7 +77,9 @@ spec:
value
:
"
{{
.Values.mail.password
}}"
-
name
:
NOMAD_MAIL_FROM
value
:
"
{{
.Values.mail.from
}}"
command
:
[
"
python"
,
"
-m"
,
"
celery"
,
"
worker"
,
"
-l"
,
"
info"
,
"
-A"
,
"
nomad.processing"
,
"
-Q"
,
"
celery,calcs,uploads"
]
-
name
:
NOMAD_CONSOLE_LOGLEVEL
value
:
"
ERROR"
command
:
[
"
python"
,
"
-m"
,
"
celery"
,
"
worker"
,
"
-A"
,
"
nomad.processing"
,
"
-Q"
,
"
celery,calcs,uploads"
]
livenessProbe
:
exec
:
command
:
...
...
This diff is collapsed.
Click to expand it.
ops/helm/nomad/values.yaml
+
1
−
1
View file @
c1be7695
...
...
@@ -41,7 +41,7 @@ api:
## Everthing concerning the nomad worker
worker
:
replicas
:
1
replicas
:
2
# request and limit in GB
memrequest
:
32
memlimit
:
320
...
...
This diff is collapsed.
Click to expand it.
ops/migration_client.env.sh
0 → 100644
+
4
−
0
View file @
c1be7695
export
NOMAD_URL
=
http://enc-staging-nomad.esc.rzg.mpg.de/fairdi/nomad/migration/api
export
NOMAD_USER
=
admin
export
NOMAD_FILES_NOMAD_TMP_DIR
=
/nomad/mscheidg/migration_tmp
export
NOMAD_LOGSTASH_TCPPORT
=
15000
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment