diff options
| author | Milo Casagrande <milo.casagrande@linaro.org> | 2015-01-29 14:42:04 +0100 |
|---|---|---|
| committer | Milo Casagrande <milo.casagrande@linaro.org> | 2015-01-29 14:42:04 +0100 |
| commit | 077ed9063620da616cbf1e38a24995b5a70d854c (patch) | |
| tree | 1499a01d9d35dac0b2879d4ef6e84111ee3cd523 | |
| parent | f293f9316f3dcdaf736aea86fecccffc2f155276 (diff) | |
ansible: Tweak celery init scripts.
Change-Id: Icce7fd279c8f94472cb18c5a223131ef6de0495e
| -rw-r--r-- | ansible/roles/init-conf/templates/celery.conf | 5 | ||||
| -rw-r--r-- | ansible/roles/init-conf/templates/kernelci-celery-beat.conf | 2 | ||||
| -rw-r--r-- | ansible/roles/init-conf/templates/kernelci-celery.service | 8 |
3 files changed, 7 insertions, 8 deletions
diff --git a/ansible/roles/init-conf/templates/celery.conf b/ansible/roles/init-conf/templates/celery.conf index 3742ee7..a7c64a2 100644 --- a/ansible/roles/init-conf/templates/celery.conf +++ b/ansible/roles/init-conf/templates/celery.conf @@ -19,9 +19,8 @@ chdir {{ install_base }}/{{ hostname }}/app script if [ -d {{ install_base }}/.venv/{{ hostname }} ]; then - . {{ install_base }}/.venv/{{ hostname }}/bin/activate - {{ install_base }}/.venv/{{ hostname }}/bin/celery worker --autoscale=4,1 --logfile=/var/log/celery/%h%I.log --loglevel=INFO --pidfile=/tmp/celery.pid --app=taskqueue + {{ install_base }}/.venv/{{ hostname }}/bin/python -OO -R {{ install_base }}/.venv/{{ hostname }}/bin/celery worker -Ofair --without-gossip --autoscale=4,1 --logfile=/var/log/celery/%h%I.log --loglevel=INFO --app=taskqueue else - exec celery worker --autoscale=4,1 --logfile=/var/log/celery/%h%I.log --loglevel=INFO --pidfile=/tmp/celery.pid --app=taskqueue + exec celery worker -Ofair --without-gossip --autoscale=4,1 --logfile=/var/log/celery/%h%I.log --loglevel=INFO --app=taskqueue fi end script diff --git a/ansible/roles/init-conf/templates/kernelci-celery-beat.conf b/ansible/roles/init-conf/templates/kernelci-celery-beat.conf index e104f2b..b35e9ff 100644 --- a/ansible/roles/init-conf/templates/kernelci-celery-beat.conf +++ b/ansible/roles/init-conf/templates/kernelci-celery-beat.conf @@ -19,7 +19,7 @@ chdir {{ install_base }}/{{ hostname }}/app script if [ -d {{ install_base }}/.venv/{{ hostname }} ]; then - {{ install_base }}/.venv/{{ hostname }}/bin/celery beat --loglevel=INFO --schedule /var/run/celery/kernelci-beat.db --app=taskqueue + {{ install_base }}/.venv/{{ hostname }}/bin/python -OO -R {{ install_base }}/.venv/{{ hostname }}/bin/celery beat --loglevel=INFO --schedule /var/run/celery/kernelci-beat.db --app=taskqueue else exec celery beat --loglevel=INFO --schedule /var/run/celery/kernelci-beat.db --app=taskqueue fi diff --git a/ansible/roles/init-conf/templates/kernelci-celery.service b/ansible/roles/init-conf/templates/kernelci-celery.service index c3a969b..5462ec4 100644 --- a/ansible/roles/init-conf/templates/kernelci-celery.service +++ b/ansible/roles/init-conf/templates/kernelci-celery.service @@ -17,13 +17,13 @@ WorkingDirectory={{ install_base }}/{{ hostname }}/app {% if role == "production" %} ExecStart={{ install_base }}/.venv/{{ hostname }}/bin/python -OO -R \ {{ install_base }}/.venv/{{ hostname }}/bin/celery worker \ - --autoscale=16,4 --loglevel=INFO \ - --pidfile=/tmp/kernelci-celery.pid --app=taskqueue + -Ofair --without-gossip --autoscale=16,4 --loglevel=INFO \ + --app=taskqueue {% else %} ExecStart={{ install_base }}/.venv/{{ hostname }}/bin/python -OO -R \ {{ install_base }}/.venv/{{ hostname }}/bin/celery worker \ - --autoscale=5,1 --loglevel=INFO \ - --pidfile=/tmp/kernelci-celery.pid --app=taskqueue + -Ofair --without-gossip --autoscale=5,1 --loglevel=INFO \ + --app=taskqueue {% endif %} [Install] |