lock on multi start for things like beat and flower

Author: wwaltersp

handlers/main.yml

@@ -3,14 +3,14 @@
   systemd:
     name: "{{item.name}}.service"
     state: started
-    enabled: "{{item.enable|default(no)}}"
+    enabled: "{{item.enable|default('no')}}"
   with_items: "{{celery_services}}"
 
 - name: "restart celery services"
   systemd:
     name: "{{item.name}}.service"
     state: restarted
-    enabled: "{{item.enable|default(no)}}"
+    enabled: "{{item.enable|default('no')}}"
   with_items: "{{celery_services}}"
 
 - name: "stop celery services"

templates/celery.service.j2

@@ -3,17 +3,19 @@ Description=Celery Service
 After=network.target
 
 [Service]
+{% if item.multi is defined -%}
 Type=forking
+{% endif %}
 User={{celery_user}}
 Group={{celery_user}}
 EnvironmentFile={{celery_env_dir}}/{{item.name}}
 WorkingDirectory={{celery_working_dir}}
-ExecStart=/bin/sh -c '${CELERY_BIN} multi start ${CELERYD_NODES} \
+ExecStart=/bin/sh -c '${CELERY_BIN} ${CELERY_MULTI_START} ${CELERYD_NODES} \
   -A ${CELERY_APP} --pidfile=${CELERYD_PID_FILE} \
   --logfile=${CELERYD_LOG_FILE} --loglevel=${CELERYD_LOG_LEVEL} ${CELERYD_OPTS}'
-ExecStop=/bin/sh -c '${CELERY_BIN} multi stopwait ${CELERYD_NODES} \
+ExecStop=/bin/sh -c '${CELERY_BIN} ${CELERY_MULTI_STOP} ${CELERYD_NODES} \
   --pidfile=${CELERYD_PID_FILE}'
-ExecReload=/bin/sh -c '${CELERY_BIN} multi restart ${CELERYD_NODES} \
+ExecReload=/bin/sh -c '${CELERY_BIN} ${CELERY_MULTI_RESTART} ${CELERYD_NODES} \
   -A ${CELERY_APP} --pidfile=${CELERYD_PID_FILE} \
   --logfile=${CELERYD_LOG_FILE} --loglevel=${CELERYD_LOG_LEVEL} ${CELERYD_OPTS}'
 

templates/celery_env.j2

@@ -4,3 +4,8 @@
 {{k}}='{{v}}'
 {% endif %}
 {% endfor %}
+{% if item.multi is defined %}
+CELERY_MULTI_START='multi start'
+CELERY_MULTI_STOP='multi stop'
+CELERY_MULTI_RESTART='multi restart'
+{% endif %}