Create celerycam role and add it to the masterserver

chhofi · Aug 3, 2015 · bd6b173 · bd6b173
1 parent b20082f
commit bd6b173
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 49 deletions.
diff --git a/masterserver.yml b/masterserver.yml
@@ -22,4 +22,5 @@
     - {role: rabbitmq, when: "'masterservers' in group_names"}
     - {role: gunicorn, when: "'masterservers' in group_names"}
     - {role: web, when: "'masterservers' in group_names"}
+    - {role: celerycam, when: "'masterservers' in group_names"}
     - {role: graylog, when: "'masterservers' in group_names"}
diff --git a/roles/celery/defaults/main.yml b/roles/celery/defaults/main.yml
@@ -6,11 +6,9 @@ celery_group: "{{ web_group }}"
 celery_application_name: celery
 celery_scripts_dir: "{{ virtualenv_path }}/scripts/celery"
 celery_template_file: "{{ celery_application_name }}_start.j2"
-celerycam_template_file: "celerycam_start.j2"
 celery_worker_app: "{{ application_name }}"
 
 celery_log_dir: "{{ virtualenv_path }}/logs"
 celery_log_file: "{{ celery_log_dir }}/{{ celery_application_name }}.log"
-celerycam_log_file: "{{ celery_log_dir }}/celerycam.log"
 
 celery_num_workers: 2
diff --git a/roles/celery/tasks/copy_scripts.yml b/roles/celery/tasks/copy_scripts.yml
@@ -17,12 +17,3 @@
             mode=0755
   tags:
     - celery
-
-- name: Create the celerycam script file
-  template: src={{ celerycam_template_file }}
-            dest={{ celery_scripts_dir }}/celerycam_start
-            owner={{ celery_user }}
-            group={{ celery_group }}
-            mode=0755
-  tags:
-    - celery
diff --git a/roles/celery/tasks/main.yml b/roles/celery/tasks/main.yml
@@ -17,10 +17,3 @@
   tags:
     - celery
     - supervisor
-
-- name: Restart the celerycam app
-  set_fact: "{{ supervisor_restart_programms}} + [celerycam]"
-  when: supervisor_applications.stdout.find('celerycam') != -1
-  tags:
-    - celery
-    - supervisor
diff --git a/roles/celery/tasks/setup_supervisor.yml b/roles/celery/tasks/setup_supervisor.yml
@@ -9,15 +9,6 @@
     - celery
     - supervisor
 
-- name: Create the Supervisor file for celerycam
-  template: src=supervisor_celerycam.conf.j2
-            dest=/etc/supervisor/conf.d/celerycam.conf
-  notify: Supervisor reread
-  notify: Supervisor update
-  tags:
-    - celery
-    - supervisor
-
 - name: Create the {{ celery_application_name }} log directory
   file: path={{ celery_log_dir }}
         owner={{ celery_user }}

diff --git a/roles/celery/templates/celerycam_start.j2 b/roles/celery/templates/celerycam_start.j2
diff --git a/roles/celery/templates/supervisor_celerycam.conf.j2 b/roles/celery/templates/supervisor_celerycam.conf.j2