Commit 9e230e95 by Edward Zarecor

Updating based on CR, and adding highlevel tag until wildcards exist.

parent 6371b6ad
...@@ -55,6 +55,7 @@ ...@@ -55,6 +55,7 @@
shell=/bin/false shell=/bin/false
generate_ssh_key=yes generate_ssh_key=yes
tags: tags:
- install
- install:base - install:base
# Assumes that the home directory has been created above. # Assumes that the home directory has been created above.
...@@ -75,6 +76,7 @@ ...@@ -75,6 +76,7 @@
- "data" - "data"
- "staticfiles" - "staticfiles"
tags: tags:
- install
- install:base - install:base
- name: create /edx/var and /edx/etc dirs - name: create /edx/var and /edx/etc dirs
...@@ -88,6 +90,7 @@ ...@@ -88,6 +90,7 @@
- /edx/var - /edx/var
- /edx/etc - /edx/etc
tags: tags:
- install
- install:base - install:base
- name: create edx_service log dir - name: create edx_service log dir
...@@ -99,6 +102,7 @@ ...@@ -99,6 +102,7 @@
with_items: with_items:
- "{{ COMMON_LOG_DIR }}/{{ edx_service_name }}" - "{{ COMMON_LOG_DIR }}/{{ edx_service_name }}"
tags: tags:
- install
- install:base - install:base
- name: write out app config file - name: write out app config file
...@@ -108,6 +112,7 @@ ...@@ -108,6 +112,7 @@
mode=0644 mode=0644
when: edx_service_config is defined when: edx_service_config is defined
tags: tags:
- install
- install:configuration - install:configuration
- name: install a bunch of system packages on which edx_service relies - name: install a bunch of system packages on which edx_service relies
...@@ -115,6 +120,7 @@ ...@@ -115,6 +120,7 @@
with_items: edx_service_packages.debian with_items: edx_service_packages.debian
when: ansible_distribution in common_debian_variants when: ansible_distribution in common_debian_variants
tags: tags:
- install
- install:system-requirements - install:system-requirements
- name: install a bunch of system packages on which edx_service relies - name: install a bunch of system packages on which edx_service relies
...@@ -122,6 +128,7 @@ ...@@ -122,6 +128,7 @@
with_items: edx_service_name.redhat with_items: edx_service_name.redhat
when: ansible_distribution in common_redhat_variants when: ansible_distribution in common_redhat_variants
tags: tags:
- install
- install:system-requirements - install:system-requirements
- name: set git fetch.prune to ignore deleted remote refs - name: set git fetch.prune to ignore deleted remote refs
...@@ -129,6 +136,7 @@ ...@@ -129,6 +136,7 @@
sudo_user: "{{ edx_service_user }}" sudo_user: "{{ edx_service_user }}"
when: edx_service_repos is defined when: edx_service_repos is defined
tags: tags:
- install
- install:code - install:code
- name: validate git protocol - name: validate git protocol
...@@ -136,6 +144,7 @@ ...@@ -136,6 +144,7 @@
when: (item.PROTOCOL != "https") and (item.PROTOCOL != "ssh") and edx_service_repos is defined when: (item.PROTOCOL != "https") and (item.PROTOCOL != "ssh") and edx_service_repos is defined
with_items: edx_service_repos with_items: edx_service_repos
tags: tags:
- install
- install:code - install:code
- name: install read-only ssh key - name: install read-only ssh key
...@@ -146,6 +155,7 @@ ...@@ -146,6 +155,7 @@
when: item.PROTOCOL == "ssh" and edx_service_repos is defined when: item.PROTOCOL == "ssh" and edx_service_repos is defined
with_items: edx_service_repos with_items: edx_service_repos
tags: tags:
- install
- install:code - install:code
- name: checkout code over ssh - name: checkout code over ssh
...@@ -158,6 +168,7 @@ ...@@ -158,6 +168,7 @@
when: item.PROTOCOL == "ssh" and edx_service_repos is defined when: item.PROTOCOL == "ssh" and edx_service_repos is defined
with_items: edx_service_repos with_items: edx_service_repos
tags: tags:
- install
- install:code - install:code
- name: checkout code over https - name: checkout code over https
...@@ -169,6 +180,7 @@ ...@@ -169,6 +180,7 @@
when: item.PROTOCOL == "https" and edx_service_repos is defined when: item.PROTOCOL == "https" and edx_service_repos is defined
with_items: edx_service_repos with_items: edx_service_repos
tags: tags:
- install
- install:code - install:code
- name: get instance information - name: get instance information
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
owner={{ supervisor_user }} group={{ common_web_user }} mode=0644 owner={{ supervisor_user }} group={{ common_web_user }} mode=0644
with_items: ['xqueue', 'xqueue_consumer'] with_items: ['xqueue', 'xqueue_consumer']
tags: tags:
- install
- install:configuration - install:configuration
- name: "enabling supervisor scripts - xqueue, xqueue consumer" - name: "enabling supervisor scripts - xqueue, xqueue consumer"
...@@ -15,6 +16,7 @@ ...@@ -15,6 +16,7 @@
with_items: ['xqueue', 'xqueue_consumer'] with_items: ['xqueue', 'xqueue_consumer']
when: not disable_edx_services when: not disable_edx_services
tags: tags:
- install
- install:configuration - install:configuration
- name: "add gunicorn configuration file" - name: "add gunicorn configuration file"
...@@ -24,6 +26,7 @@ ...@@ -24,6 +26,7 @@
notify: notify:
- restart xqueue - restart xqueue
tags: tags:
- install
- install:configuration - install:configuration
- name: create xqueue application config - name: create xqueue application config
...@@ -32,6 +35,7 @@ ...@@ -32,6 +35,7 @@
notify: notify:
- restart xqueue - restart xqueue
tags: tags:
- install
- install:configuration - install:configuration
- name: create xqueue auth file - name: create xqueue auth file
...@@ -40,6 +44,7 @@ ...@@ -40,6 +44,7 @@
notify: notify:
- restart xqueue - restart xqueue
tags: tags:
- install
- install:configuration - install:configuration
# Do A Checkout # Do A Checkout
...@@ -52,6 +57,7 @@ ...@@ -52,6 +57,7 @@
notify: notify:
- restart xqueue - restart xqueue
tags: tags:
- install
- install:code - install:code
...@@ -64,6 +70,7 @@ ...@@ -64,6 +70,7 @@
notify: notify:
- restart xqueue - restart xqueue
tags: tags:
- install
- install:application-requirements - install:application-requirements
# Install the python post requirements into {{ xqueue_venv_dir }} # Install the python post requirements into {{ xqueue_venv_dir }}
...@@ -75,6 +82,7 @@ ...@@ -75,6 +82,7 @@
notify: notify:
- restart xqueue - restart xqueue
tags: tags:
- install
- install:application-requirements - install:application-requirements
# If there is a common user for migrations run migrations using his username # If there is a common user for migrations run migrations using his username
...@@ -90,6 +98,7 @@ ...@@ -90,6 +98,7 @@
notify: notify:
- restart xqueue - restart xqueue
tags: tags:
- migrate
- migrate:db - migrate:db
- name: create users - name: create users
...@@ -99,6 +108,7 @@ ...@@ -99,6 +108,7 @@
notify: notify:
- restart xqueue - restart xqueue
tags: tags:
- manage
- manage:app-users - manage:app-users
# call supervisorctl update. this reloads # call supervisorctl update. this reloads
...@@ -111,7 +121,7 @@ ...@@ -111,7 +121,7 @@
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 != ""
when: not disable_edx_services when: not disable_edx_services
- name: ensure xqueue, consumer is running - name: ensure xqueue, consumer is running
supervisorctl: > supervisorctl: >
name={{ item }} name={{ item }}
...@@ -123,6 +133,7 @@ ...@@ -123,6 +133,7 @@
- xqueue_consumer - xqueue_consumer
when: not disable_edx_services when: not disable_edx_services
tags: tags:
- manage
- manage:start - manage:start
- name: create a symlink for venv python - name: create a symlink for venv python
...@@ -134,6 +145,7 @@ ...@@ -134,6 +145,7 @@
- python - python
- pip - pip
tags: tags:
- install
- install:base - install:base
- set_fact: xqueue_installed=true - set_fact: xqueue_installed=true
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
notify: notify:
- restart xqueue - restart xqueue
tags: tags:
- install
- install:base - install:base
- name: create xqueue app and venv dir - name: create xqueue app and venv dir
...@@ -29,6 +30,7 @@ ...@@ -29,6 +30,7 @@
- "{{ xqueue_app_dir }}" - "{{ xqueue_app_dir }}"
- "{{ xqueue_venvs_dir }}" - "{{ xqueue_venvs_dir }}"
tags: tags:
- install
- install:base - install:base
- name: install a bunch of system packages on which xqueue relies - name: install a bunch of system packages on which xqueue relies
...@@ -36,6 +38,7 @@ ...@@ -36,6 +38,7 @@
notify: notify:
- restart xqueue - restart xqueue
tags: tags:
- install
- install:system-requirements - install:system-requirements
- include: deploy.yml tags=deploy - include: deploy.yml tags=deploy
......
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