From 7db3f3099f91f14f1d12ab7d5b127f048a0959c8 Mon Sep 17 00:00:00 2001
From: Jonathan Math <jonathanamath@gmail.com>
Date: Tue, 2 Feb 2021 23:20:33 -0500
Subject: [PATCH] add celery_task role and ruse in in setup_task.yml

---
 ansible/roles/celery_task/tasks/main.yml | 34 ++++++++++++
 ansible/setup_task.yml                   | 68 +-----------------------
 2 files changed, 35 insertions(+), 67 deletions(-)
 create mode 100644 ansible/roles/celery_task/tasks/main.yml

diff --git a/ansible/roles/celery_task/tasks/main.yml b/ansible/roles/celery_task/tasks/main.yml
new file mode 100644
index 000000000..99af80ffe
--- /dev/null
+++ b/ansible/roles/celery_task/tasks/main.yml
@@ -0,0 +1,34 @@
+---
+- name: Start {{ item.container_name }} docker container
+  become: yes
+  with_items:
+    - { 
+      container_name: task_celery,
+      command: "celery worker -A newsblur_web --loglevel=INFO -Q new_feeds,push_feeds,update_feeds" 
+    }
+    - {
+      container_name: task_beat_feeds,
+      command: "celery worker -A newsblur_web --loglevel=INFO -Q beat_feeds_task -c 1" 
+    }
+    - {
+      container_name: task_search_indexer,
+      command: "celery worker -A newsblur_web --loglevel=INFO -Q search_indexer -c 4"
+    }
+    - {
+      container_name: task_search_indexer_tasker,
+      command: "celery worker -A newsblur_web --loglevel=INFO -Q search_indexer_tasker -c 2"
+    }
+    - {
+      container_name: task_work_queue,
+      command: "celery worker -A newsblur_web --loglevel=INFO -Q work_queue"
+    }
+  docker_container:
+    name: "{{ item.container_name }}"
+    image: newsblur/newsblur_python3
+    state: started
+    env:
+      DOCKERBUILD: "True"
+    restart_policy: unless-stopped
+    command: "{{ item.command }}"
+    volumes:
+      - /srv/newsblur:/srv/newsblur
\ No newline at end of file
diff --git a/ansible/setup_task.yml b/ansible/setup_task.yml
index d22bafc6e..0e4c281ad 100644
--- a/ansible/setup_task.yml
+++ b/ansible/setup_task.yml
@@ -11,70 +11,4 @@
     - base
     - docker
     - repo
-  tasks:
-    - name: Start task_celery docker container
-      docker_container:
-        name: task_celery
-        image: newsblur/newsblur_python3
-        state: started
-        env:
-          DOCKERBUILD: "True"
-        command: "celery worker -A newsblur_web --loglevel=INFO -Q new_feeds,push_feeds,update_feeds"
-        restart_policy: unless-stopped
-        volumes:
-          - /srv/newsblur:/srv/newsblur
-    - name: Start task_cron_queue docker container
-      docker_container:
-        name: task_cron_queue
-        image: newsblur/newsblur_python3
-        state: started
-        env:
-          DOCKERBUILD: "True"
-        restart_policy: unless-stopped
-        command: "celery worker -A newsblur_web --loglevel=INFO -Q cron_queue -c 3"
-        volumes:
-          - /srv/newsblur:/srv/newsblur
-    - name: Start task_beat_feeds docker container
-      docker_container:
-        name: task_beat_feeds
-        image: newsblur/newsblur_python3
-        state: started
-        env:
-          DOCKERBUILD: "True"
-        restart_policy: unless-stopped
-        command: "celery worker -A newsblur_web --loglevel=INFO -Q beat_feeds_task -c 1"
-        volumes:
-          - /srv/newsblur:/srv/newsblur
-    - name: Start task_search_indexer docker container
-      docker_container:
-        name: task_search_indexer
-        image: newsblur/newsblur_python3
-        state: started
-        env:
-          DOCKERBUILD: "True"
-        restart_policy: unless-stopped
-        command: "celery worker -A newsblur_web --loglevel=INFO -Q search_indexer -c 4"
-        volumes:
-          - /srv/newsblur:/srv/newsblur
-    - name: Start task_search_indexer_tasker docker container
-      docker_container:
-        name: task_search_indexer_tasker
-        image: newsblur/newsblur_python3
-        state: started
-        env:
-          DOCKERBUILD: "True"
-        restart_policy: unless-stopped
-        command: "celery worker -A newsblur_web --loglevel=INFO -Q search_indexer_tasker -c 2"
-        volumes:
-          - /srv/newsblur:/srv/newsblur
-    - name: Start task_work_queue docker container
-      docker_container:
-        name: task_work_queue
-        image: newsblur/newsblur_python3
-        state: started
-        env:
-          DOCKERBUILD: "True"
-        restart_policy: unless-stopped
-        command: bash -c "celery worker -A newsblur_web --loglevel=INFO -Q work_queue"
-        volumes:
-          - /srv/newsblur:/srv/newsblur
+    - celery_task
\ No newline at end of file