turnip

Merge ~ilasc/turnip:add-virtinfo-env-variables into turnip:master

  1. Git
  2. lp:~ilasc/turnip
  3. add-virtinfo-env-variables
  4. Merge into master
Proposed by Ioana Lasc
Status: Merged
Approved by: Ioana Lasc
Approved revision: 7d5647e65e63678002d28df97671b3e43e573453
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~ilasc/turnip:add-virtinfo-env-variables
Merge into: turnip:master
Diff against target: 15 lines (+3/-0)
1 file modified
charm/turnip-celery/templates/turnip-celery-repack.service.j2 (+3/-0)
Reviewer Review Type Date Requested Status
Cristian Gonzalez (community) Approve
Review via email: mp+403030@code.launchpad.net

Commit message

Add virtinfo env variables to repacks celery worker

To post a comment you must log in.
Revision history for this message
Cristian Gonzalez (cristiangsp) wrote :

Looks good!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/charm/turnip-celery/templates/turnip-celery-repack.service.j2 b/charm/turnip-celery/templates/turnip-celery-repack.service.j2
2index 6de5c7d..cf1f3d6 100644
3--- a/charm/turnip-celery/templates/turnip-celery-repack.service.j2
4+++ b/charm/turnip-celery/templates/turnip-celery-repack.service.j2
5@@ -12,7 +12,10 @@ Group={{ group }}
6 WorkingDirectory={{ code_dir }}
7 Environment=PATH={{ venv_dir }}/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
8 Environment=REPO_STORE={{ data_dir }}/repos
9+Environment=TURNIP_LOG_DIR={{ logs_dir }}
10 Environment=CELERY_BROKER={{ celery_broker }}
11+Environment=VIRTINFO_ENDPOINT={{ virtinfo_endpoint }}
12+Environment=VIRTINFO_TIMEOUT={{ virtinfo_timeout }}
13 ExecStart={{ venv_dir }}/bin/celery -A turnip.tasks worker -n repack-worker --logfile={{ logs_dir }}/turnip-celery-repacks.log --loglevel=DEBUG --pool=gevent --prefetch-multiplier=1 --queue=repacks --concurrency=1
14 ExecReload=/bin/kill -s HUP $MAINPID
15 ExecStop=/bin/kill -s TERM $MAINPID

Subscribers

People subscribed via source and target branches