← Back to team overview

launchpad-reviewers team mailing list archive

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

 

Ioana Lasc has proposed merging ~ilasc/turnip:add-virtinfo-env-variables into turnip:master.

Commit message:
Add virtinfo env variables to repacks celery worker

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~ilasc/turnip/+git/turnip/+merge/403030
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~ilasc/turnip:add-virtinfo-env-variables into turnip:master.
diff --git a/charm/turnip-celery/templates/turnip-celery-repack.service.j2 b/charm/turnip-celery/templates/turnip-celery-repack.service.j2
index 6de5c7d..cf1f3d6 100644
--- a/charm/turnip-celery/templates/turnip-celery-repack.service.j2
+++ b/charm/turnip-celery/templates/turnip-celery-repack.service.j2
@@ -12,7 +12,10 @@ Group={{ group }}
 WorkingDirectory={{ code_dir }}
 Environment=PATH={{ venv_dir }}/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
 Environment=REPO_STORE={{ data_dir }}/repos
+Environment=TURNIP_LOG_DIR={{ logs_dir }}
 Environment=CELERY_BROKER={{ celery_broker }}
+Environment=VIRTINFO_ENDPOINT={{ virtinfo_endpoint }}
+Environment=VIRTINFO_TIMEOUT={{ virtinfo_timeout }}
 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
 ExecReload=/bin/kill -s HUP $MAINPID
 ExecStop=/bin/kill -s TERM $MAINPID