Editing template to merge defaults with env vars defined per celery service

Author: sp-lyang

templates/celery_env.j2

@@ -1,13 +1,10 @@
 {{ansible_managed}}
-{% for k, v in item.environment.items()|sort %}
-{% if '__omit_place_holder__' not in v|string %}
+{% if item.environment is defined %}
+{% for k, v in (celeryd_default_env|combine(item.environment)).items()|sort %}
 {{k}}='{{v}}'
-{% endif %}
 {% endfor %}
-{% if item.opts is defined %}
-{% for k, v in item.opts.items()|sort %}
-{% if '__omit_place_holder__' not in v|string %}
+{% else %}
+{% for k, v in celeryd_default_env.items()|sort %}
 {{k}}='{{v}}'
-{% endif %}
 {% endfor %}
-{% endif %}}
+{% endif %}

tests/test.yml

@@ -44,7 +44,7 @@
 - hosts: localhost
   remote_user: root
   roles:
-    - { role: role_under_test, celery_working_dir: /srv, celery_app: tasks, celery_user: celery, celery_services: [{name: celeryd, environment: "{{celeryd_default_env}}"}]}
+    - { role: role_under_test, celery_working_dir: /srv, celery_app: tasks, celery_user: celery, celery_services: [{name: celeryd}]}
 
   tasks:
     - name: Test service handlers