Commit 64df07b6 by Edward Zarecor

Merge pull request #2519 from edx/e0d/supervisor-tags

Adding tags to depency
parents 5ec5e763 b2802075
...@@ -55,12 +55,18 @@ ...@@ -55,12 +55,18 @@
name="{{ supervisor_user }}" name="{{ supervisor_user }}"
createhome=no createhome=no
shell=/bin/false shell=/bin/false
tags:
- install
- install:base
- name: create supervisor service user - name: create supervisor service user
user: > user: >
name="{{ supervisor_service_user }}" name="{{ supervisor_service_user }}"
createhome=no createhome=no
shell=/bin/false shell=/bin/false
tags:
- install
- install:base
- name: create supervisor directories - name: create supervisor directories
file: > file: >
...@@ -72,6 +78,9 @@ ...@@ -72,6 +78,9 @@
with_items: with_items:
- "{{ supervisor_app_dir }}" - "{{ supervisor_app_dir }}"
- "{{ supervisor_venv_dir }}" - "{{ supervisor_venv_dir }}"
tags:
- install
- install:base
- name: create service user accessible dirs - name: create service user accessible dirs
file: > file: >
...@@ -83,6 +92,9 @@ ...@@ -83,6 +92,9 @@
with_items: with_items:
- "{{ supervisor_cfg_dir }}" - "{{ supervisor_cfg_dir }}"
- "{{ supervisor_available_dir }}" - "{{ supervisor_available_dir }}"
tags:
- install
- install:base
- name: create supervisor directories - name: create supervisor directories
file: > file: >
...@@ -93,13 +105,18 @@ ...@@ -93,13 +105,18 @@
with_items: with_items:
- "{{ supervisor_data_dir }}" - "{{ supervisor_data_dir }}"
- "{{ supervisor_log_dir }}" - "{{ supervisor_log_dir }}"
tags:
- install
- install:base
- name: install supervisor in its venv - name: install supervisor in its venv
pip: > pip: >
name=supervisor virtualenv="{{ supervisor_venv_dir }}" state=present name=supervisor virtualenv="{{ supervisor_venv_dir }}" state=present
extra_args="-i {{ COMMON_PYPI_MIRROR_URL }}" extra_args="-i {{ COMMON_PYPI_MIRROR_URL }}"
sudo_user: "{{ supervisor_user }}" sudo_user: "{{ supervisor_user }}"
tags:
- install
- install:base
- name: install supervisor in its venv - name: install supervisor in its venv
pip: > pip: >
...@@ -107,11 +124,17 @@ ...@@ -107,11 +124,17 @@
extra_args="-i {{ COMMON_PYPI_MIRROR_URL }}" extra_args="-i {{ COMMON_PYPI_MIRROR_URL }}"
sudo_user: "{{ supervisor_user }}" sudo_user: "{{ supervisor_user }}"
with_items: supervisor_pip_pkgs with_items: supervisor_pip_pkgs
tags:
- install
- install:base
- name: create supervisor upstart job - name: create supervisor upstart job
template: > template: >
src=etc/init/supervisor-upstart.conf.j2 dest=/etc/init/{{ supervisor_service }}.conf src=etc/init/supervisor-upstart.conf.j2 dest=/etc/init/{{ supervisor_service }}.conf
owner=root group=root owner=root group=root
tags:
- install
- install:base
# This script is aws specific and looks up instances # This script is aws specific and looks up instances
# tags and enables services based on the 'services' tag # tags and enables services based on the 'services' tag
...@@ -121,6 +144,9 @@ ...@@ -121,6 +144,9 @@
src=etc/init/pre_supervisor.conf.j2 dest=/etc/init/pre_supervisor.conf src=etc/init/pre_supervisor.conf.j2 dest=/etc/init/pre_supervisor.conf
owner=root group=root owner=root group=root
when: supervisor_service == "supervisor" and disable_edx_services and not devstack when: supervisor_service == "supervisor" and disable_edx_services and not devstack
tags:
- to-remove
- aws-specfic
- name: write the pre_suprevisor python script - name: write the pre_suprevisor python script
copy: > copy: >
...@@ -130,12 +156,18 @@ ...@@ -130,12 +156,18 @@
owner={{ supervisor_user }} owner={{ supervisor_user }}
group={{ supervisor_service_user }} group={{ supervisor_service_user }}
when: disable_edx_services when: disable_edx_services
tags:
- to-remove
- aws-specfic
- name: create supervisor master config - name: create supervisor master config
template: > template: >
src=edx/app/supervisor/supervisord.conf.j2 dest={{ supervisor_cfg }} src=edx/app/supervisor/supervisord.conf.j2 dest={{ supervisor_cfg }}
owner={{ supervisor_user }} group={{ supervisor_service_user }} owner={{ supervisor_user }} group={{ supervisor_service_user }}
mode=0644 mode=0644
tags:
- install
- install:config
- name: create a symlink for supervisortctl - name: create a symlink for supervisortctl
# these links are deprecated in favor of the shell wrapper # these links are deprecated in favor of the shell wrapper
...@@ -144,6 +176,9 @@ ...@@ -144,6 +176,9 @@
dest={{ COMMON_BIN_DIR }}/{{ supervisor_ctl|basename }} dest={{ COMMON_BIN_DIR }}/{{ supervisor_ctl|basename }}
state=absent state=absent
when: supervisor_service == "supervisor" when: supervisor_service == "supervisor"
tags:
- install
- install:config
- name: create a symlink for supervisor cfg - name: create a symlink for supervisor cfg
# these links are deprecated in favor of the shell wrapper # these links are deprecated in favor of the shell wrapper
...@@ -155,6 +190,9 @@ ...@@ -155,6 +190,9 @@
with_items: with_items:
- "{{ supervisor_cfg }}" - "{{ supervisor_cfg }}"
- "{{ supervisor_cfg_dir }}" - "{{ supervisor_cfg_dir }}"
tags:
- install
- install:config
- name: create helper script for running supervisor - name: create helper script for running supervisor
template: > template: >
...@@ -163,18 +201,27 @@ ...@@ -163,18 +201,27 @@
owner={{ supervisor_service_user }} owner={{ supervisor_service_user }}
mode=0755 mode=0755
when: supervisor_service == "supervisor" when: supervisor_service == "supervisor"
tags:
- install
- install:config
- name: start supervisor - name: start supervisor
service: > service: >
name={{ supervisor_service }} name={{ supervisor_service }}
state=started state=started
register: start_supervisor register: start_supervisor
tags:
- manage
- manager:start
# calling update on supervisor too soon after it # calling update on supervisor too soon after it
# starts will result in an errror. # starts will result in an errror.
- name: wait for web port to be available - name: wait for web port to be available
wait_for: port={{ supervisor_http_bind_port }} timeout=5 wait_for: port={{ supervisor_http_bind_port }} timeout=5
when: start_supervisor.changed when: start_supervisor.changed
tags:
- manage
- manage:start
# call supervisorctl update every time, this reloads # call supervisorctl update every time, this reloads
# the supervisorctl config # the supervisorctl config
...@@ -186,3 +233,6 @@ ...@@ -186,3 +233,6 @@
shell: "{{ supervisor_ctl }} -c {{ supervisor_cfg }} update" shell: "{{ supervisor_ctl }} -c {{ supervisor_cfg }} update"
register: supervisor_update register: supervisor_update
changed_when: supervisor_update.stdout is defined and supervisor_update.stdout != "" changed_when: supervisor_update.stdout is defined and supervisor_update.stdout != ""
tags:
- manage
- manage:start
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment