Merge pull request #491 from edx/jarv/switch-to-dependencies

using role dependencies for common/supervisor

playbooks/edx-east/deploy_certs.yml → playbooks/edx-east/certs.yml

@@ -3,6 +3,4 @@
   sudo: True
   gather_facts: True
   roles:
-    - common
-    - supervisor
     - certs

playbooks/edx-east/deploy_common.yml → playbooks/edx-east/common.yml

@@ -3,5 +3,4 @@
   sudo: True
   gather_facts: True
   roles:
-    - gh_users
     - common

playbooks/edx-east/deploy_devpi.yml → playbooks/edx-east/devpi.yml

@@ -3,6 +3,4 @@
   sudo: True
   gather_facts: True
   roles:
-    - common
-    - supervisor
     - devpi

playbooks/edx-east/deploy_discern.yml → playbooks/edx-east/discern.yml

@@ -3,6 +3,4 @@
   sudo: True
   gather_facts: True
   roles:
-    - common
-    - supervisor
     - discern

playbooks/edx-east/edx_continuous_integration.yml

@@ -7,7 +7,6 @@
     migrate_db: "yes"
     openid_workaround: True
   roles:
-    - common
     - role: nginx
       nginx_sites:
       - cms
@@ -16,7 +15,6 @@
       - xqueue
       - xserver
     - edxlocal
-    - supervisor
     - mongo
     - edxapp
     - role: demo

playbooks/edx-east/edx_dev2.yml

@@ -14,8 +14,6 @@
     - "{{ secure_dir }}/vars/common/common.yml"
     - "{{ secure_dir }}/vars/users.yml"
   roles:
-    - common
-    - supervisor
     - datadog
     - role: nginx
       nginx_sites:
@@ -34,8 +32,6 @@
     - "{{ secure_dir }}/vars/common/common.yml"
     - "{{ secure_dir }}/vars/users.yml"
   roles:
-    - common
-    - supervisor
     - datadog
     - role: nginx
       nginx_sites:
@@ -52,7 +48,6 @@
 #    - "{{ secure_dir }}/vars/dev/dev2.yml"
 #    - "{{ secure_dir }}/vars/users.yml"
 #  roles:
-#    - common
 #    - nginx
 #    - xserver
 #- hosts: tag_aws_cloudformation_stack-name_dev2:&tag_group_rabbitmq
@@ -62,7 +57,6 @@
 #    - "{{ secure_dir }}/vars/dev/dev2.yml"
 #    - "{{ secure_dir }}/vars/users.yml"
 #  roles:
-#    - common
 #    - rabbitmq
 #- hosts: tag_aws_cloudformation_stack-name_dev2:&tag_group_xqueue
 #  sudo: True
@@ -70,6 +64,5 @@
 #    - "{{ secure_dir }}/vars/dev/dev2.yml"
 #    - "{{ secure_dir }}/vars/users.yml"
 #  roles:
-#    - common
 #    - nginx
 #    - xqueue

playbooks/edx-east/edx_feanilsandbox.yml

@@ -6,8 +6,6 @@
     - "{{ secure_dir }}/vars/common/common.yml"
     - "{{ secure_dir }}/vars/users.yml"
   roles:
-    - common
-    - supervisor
     - datadog
     - role: nginx
       nginx_sites:
@@ -25,8 +23,6 @@
     - "{{ secure_dir }}/vars/common/common.yml"
     - "{{ secure_dir }}/vars/users.yml"
   roles:
-    - common
-    - supervisor
     - datadog
     - role: nginx
       nginx_sites:
@@ -44,8 +40,6 @@
     - "{{ secure_dir }}/vars/dev/feanilsandbox.yml"
     - "{{ secure_dir }}/vars/users.yml"
   roles:
-    - common
-    - supervisor
     - role: nginx
       nginx_sites:
       - xserver
@@ -58,8 +52,6 @@
     - "{{ secure_dir }}/vars/dev/feanilsandbox.yml"
     - "{{ secure_dir }}/vars/users.yml"
   roles:
-    - common
-    - supervisor
     - rabbitmq
     - splunkforwarder
 - hosts: tag_aws_cloudformation_stack-name_feanilsandbox:&tag_role_xqueue
@@ -68,8 +60,6 @@
     - "{{ secure_dir }}/vars/dev/feanilsandbox.yml"
     - "{{ secure_dir }}/vars/users.yml"
   roles:
-    - common
-    - supervisor
     - role: nginx
       nginx_sites:
       - xqueue
@@ -81,6 +71,5 @@
     - "{{ secure_dir }}/vars/dev/feanilsandbox.yml"
     - "{{ secure_dir }}/vars/users.yml"
   roles:
-    - common
     - role: 'mongo'
       mongo_clustered: true

playbooks/edx-east/edx_mirror.yml

@@ -4,8 +4,6 @@
   sudo: True
   gather_facts: False
   roles:
-    - common
-    - supervisor
     - role: nginx
       nginx_sites:
       - devpi

playbooks/edx-east/edx_notifier.yml

@@ -6,8 +6,6 @@
     - "{{ secure_dir }}/vars/users.yml"
   gather_facts: True
   roles:
-    - common
-    - supervisor
     - role: virtualenv
       virtualenv_user: "notifier"
       virtualenv_user_home: "/opt/wwc/notifier"
@@ -22,8 +20,6 @@
     - "{{ secure_dir }}/vars/users.yml"
   gather_facts: True
   roles:
-    - common
-    - supervisor
     - role: virtualenv
       virtualenv_user: "notifier"
       virtualenv_user_home: "/opt/wwc/notifier"
@@ -38,8 +34,6 @@
     - "{{ secure_dir }}/vars/users.yml"
   gather_facts: True
   roles:
-    - common
-    - supervisor
     - role: virtualenv
       virtualenv_user: "notifier"
       virtualenv_user_home: "/opt/wwc/notifier"
@@ -54,8 +48,6 @@
     - "{{ secure_dir }}/vars/users.yml"
   gather_facts: True
   roles:
-    - common
-    - supervisor
     - role: virtualenv
       virtualenv_user: "notifier"
       virtualenv_user_home: "/opt/wwc/notifier"
@@ -71,8 +63,6 @@
   gather_facts: True
   vars:
   roles:
-    - common
-    - supervisor
     - role: virtualenv
       virtualenv_user: "notifier"
       virtualenv_user_home: "/opt/wwc/notifier"

playbooks/edx-east/edx_sandbox.yml

@@ -12,8 +12,6 @@
     migrate_db: "yes"
     mysql5_workaround: True
   roles:
-    - common
-    - supervisor
     - role: nginx
       nginx_sites:
       - lms

playbooks/edx-east/edx_vpc.yml

@@ -5,7 +5,6 @@
     - "{{ secure_dir }}/vars/{{ENVIRONMENT}}/{{CLOUDFORMATION_STACK_NAME}}.yml"
     - "{{ secure_dir }}/vars/common/common.yml"
   roles:
-    - common
     - gh_users
     - role: 'mongo'
       mongo_create_users: yes
@@ -15,7 +14,6 @@
 #    - "{{ secure_dir }}/vars/{{ENVIRONMENT}}/{{CLOUDFORMATION_STACK_NAME}}.yml"
 #    - "{{ secure_dir }}/vars/common/common.yml"
 #  roles:
-#    - common
 #    - gh_users
 #    - mongo
 - hosts: first_in_tag_role_edxapp
@@ -25,10 +23,8 @@
     - "{{ secure_dir }}/vars/{{ENVIRONMENT}}/{{CLOUDFORMATION_STACK_NAME}}.yml"
     - "{{ secure_dir }}/vars/common/common.yml"
   roles:
-    - common
     - gh_users
     - datadog
-    - supervisor
     - role: nginx
       nginx_sites:
       - lms
@@ -46,10 +42,8 @@
     - "{{ secure_dir }}/vars/{{ENVIRONMENT}}/{{CLOUDFORMATION_STACK_NAME}}.yml"
     - "{{ secure_dir }}/vars/common/common.yml"
   roles:
-    - common
     - gh_users
     - datadog
-    - supervisor
     - role: nginx
       nginx_sites:
       - lms
@@ -64,10 +58,8 @@
     - "{{ secure_dir }}/vars/{{ENVIRONMENT}}/{{CLOUDFORMATION_STACK_NAME}}.yml"
     - "{{ secure_dir }}/vars/common/common.yml"
   roles:
-    - common
     - gh_users
     - datadog
-    - supervisor
     - role: nginx
       nginx_sites:
       - lms
@@ -83,9 +75,7 @@
     - "{{ secure_dir }}/vars/{{ENVIRONMENT}}/{{CLOUDFORMATION_STACK_NAME}}.yml"
     - "{{ secure_dir }}/vars/common/common.yml"
   roles:
-    - common
     - gh_users
-    - supervisor
     - role: nginx
       nginx_sites:
       - xserver
@@ -98,9 +88,7 @@
     - "{{ secure_dir }}/vars/{{ENVIRONMENT}}/{{CLOUDFORMATION_STACK_NAME}}.yml"
     - "{{ secure_dir }}/vars/common/common.yml"
   roles:
-    - common
     - gh_users
-    - supervisor
     - rabbitmq
     - splunkforwarder
 - hosts: first_in_tag_role_xqueue
@@ -109,9 +97,7 @@
     - "{{ secure_dir }}/vars/{{ENVIRONMENT}}/{{CLOUDFORMATION_STACK_NAME}}.yml"
     - "{{ secure_dir }}/vars/common/common.yml"
   roles:
-    - common
     - gh_users
-    - supervisor
     - role: nginx
       nginx_sites:
       - xqueue
@@ -124,9 +110,7 @@
     - "{{ secure_dir }}/vars/{{ENVIRONMENT}}/{{CLOUDFORMATION_STACK_NAME}}.yml"
     - "{{ secure_dir }}/vars/common/common.yml"
   roles:
-    - common
     - gh_users
-    - supervisor
     - role: nginx
       nginx_sites:
       - xqueue
@@ -138,9 +122,7 @@
     - "{{ secure_dir }}/vars/{{ENVIRONMENT}}/{{CLOUDFORMATION_STACK_NAME}}.yml"
     - "{{ secure_dir }}/vars/common/common.yml"
   roles:
-    - common
     - gh_users
-    - supervisor
     - oraclejdk
     - elasticsearch
     - forum

playbooks/edx-east/deploy_edxapp.yml → playbooks/edx-east/edxapp.yml

@@ -3,6 +3,4 @@
   sudo: True
   gather_facts: True
   roles:
-    - common
-    - supervisor
     - edxapp

playbooks/edx-east/deploy_forum.yml → playbooks/edx-east/forum.yml

@@ -3,6 +3,4 @@
   sudo: True
   gather_facts: True
   roles:
-    - common
-    - supervisor
     - forum

playbooks/edx-east/mlapi_prod.yml

@@ -5,8 +5,6 @@
     - "{{ secure_dir }}/vars/users.yml"
     - "{{ secure_dir }}/vars/mlapi_prod_users.yml"
   roles:
-    - common
-    - supervisor
     - discern
   sudo: True
 - hosts:

playbooks/edx-east/mlapi_sandbox.yml

@@ -5,8 +5,6 @@
     - "{{ secure_dir }}/vars/users.yml"
     - "{{ secure_dir }}/vars/mlapi_sandbox_users.yml"
   roles:
-    - common
-    - supervisor
     - discern
   sudo: True
 - hosts:

playbooks/edx-east/mlapi_stage.yml

@@ -5,8 +5,6 @@
     - "{{ secure_dir }}/vars/users.yml"
     - "{{ secure_dir }}/vars/mlapi_stage_users.yml"
   roles:
-    - common
-    - supervisor
     - discern
   sudo: True
 - hosts:

playbooks/edx-east/deploy_ora.yml → playbooks/edx-east/ora.yml

@@ -3,6 +3,4 @@
   sudo: True
   gather_facts: True
   roles:
-    - common
-    - supervisor
     - ora

playbooks/edx-east/deploy_xqueue.yml → playbooks/edx-east/xqueue.yml

@@ -3,7 +3,4 @@
   sudo: True
   gather_facts: True
   roles:
-    - common
-    - supervisor
     - role: xqueue
-      tags: ['xqueue']

playbooks/edx-east/deploy_xserver.yml → playbooks/edx-east/xserver.yml

@@ -3,7 +3,4 @@
   sudo: True
   gather_facts: True
   roles:
-    - common
-    - supervisor
     - role: xserver
-      tags: ['xserver']

playbooks/roles/analytics-server/meta/main.yml

 ---
-
 dependencies:
   - {
   role: automated,
@@ -8,4 +7,4 @@ dependencies:
   automated_sudoers_template: 'roles/analytics-server/templates/etc/sudoers.d/99-automator-analytics-server.j2'
   }
 
-  
+

playbooks/roles/certs/meta/main.yml

+dependencies:
+  - supervisor

playbooks/roles/discern/meta/main.yml

+---
+dependencies:
+  - supervisor

playbooks/roles/edxapp/meta/main.yml

 ---
 dependencies:
+  - supervisor
   - role: rbenv
     rbenv_user: "{{ edxapp_user }}"
     rbenv_dir: "{{ edxapp_app_dir }}"

playbooks/roles/edxlocal/meta/main.yml

+---
+dependencies:
+  - common

playbooks/roles/forum/meta/main.yml

 ---
 dependencies:
+  - supervisor
   - role: rbenv
     # TODO: setting the rbenv ownership to
     # the common_web_user is a workaround

playbooks/roles/gh_mirror/meta/main.yml

+---
+dependencies:
+  - supervisor

playbooks/roles/mongo/meta/main.yml

+---
+dependencies:
+  - common

playbooks/roles/nginx/meta/main.yml

+---
+dependencies:
+  - common

playbooks/roles/notifier/meta/main.yml

+---
+dependencies:
+  - supervisor

playbooks/roles/ora/meta/main.yml

+---
+dependencies:
+  - supervisor

playbooks/roles/rabbitmq/meta/main.yml

+---
+dependencies:
+  - common

playbooks/roles/supervisor/meta/main.yml

+---
+dependencies:
+  - common

playbooks/roles/xqueue/meta/main.yml

+---
+dependencies:
+  - supervisor

playbooks/roles/xserver/meta/main.yml

+---
+dependencies:
+  - supervisor

playbooks/vagrant-devstack.yml

@@ -11,7 +11,6 @@
   vars_files:
     - "group_vars/all"
   roles:
-    - common
     - edxlocal
     - mongo
     - edxapp

playbooks/vagrant-fullstack.yml

@@ -11,7 +11,6 @@
     - "group_vars/all"
   roles:
     - gh_users
-    - common
     - role: nginx
       nginx_sites:
       - cms
@@ -19,7 +18,6 @@
       - ora
       - xqueue
     - edxlocal
-    - supervisor
     - mongo
     - edxapp
     - demo

playbooks/vagrant-shortstack-xml.yml

@@ -8,13 +8,11 @@
   vars_files:
     - "group_vars/all"
   roles:
-    - common
     - role: nginx
       nginx_sites:
       - lms
       - cms
       - lms-preview
     - edxlocal
-    - supervisor
     - mongo
     - { role: 'edxapp', EDXAPP_LMS_NGINX_PORT: 18030, EDXAPP_LMS_XML_NGINX_PORT: 80 }

playbooks/vagrant-shortstack.yml

@@ -8,14 +8,12 @@
   vars_files:
     - "group_vars/all"
   roles:
-    - common
     - role: nginx
       nginx_sites:
       - lms
       - cms
       - lms-preview
     - edxlocal
-    - supervisor
     - mongo
     - edxapp
     - oraclejdk

util/jenkins/ansible-provision.sh

@@ -129,7 +129,7 @@ EOF
     if [[ $server_type == "full_edx_installation" ]]; then
         # additional tasks that need to be run if the
         # entire edx stack is brought up from an AMI
-        ansible-playbook deploy_rabbitmq.yml -i "${deploy_host}," -e "@${extra_vars}" --user ubuntu
+        ansible-playbook rabbitmq.yml -i "${deploy_host}," -e "@${extra_vars}" --user ubuntu
         ansible-playbook restart_supervisor.yml -i "${deploy_host}," -e "@${extra_vars}" --user ubuntu
     fi
 fi
@@ -153,7 +153,7 @@ fi
 # Run deploy tasks for the roles selected
 for i in "${!deploy[@]}"; do
     if [[ ${deploy[$i]} == "true" ]]; then
-        ansible-playbook deploy_${i}.yml -i "${deploy_host}," -e "@${extra_vars}" --user ubuntu --tags deploy
+        ansible-playbook ${i}.yml -i "${deploy_host}," -e "@${extra_vars}" --user ubuntu --tags deploy
     fi
 done