using role dependencies for common and supervisor

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/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/roles/gh_mirror/meta/main.yml

+---
+dependencies:
+  - common
+  - supervisor

playbooks/roles/notifier/meta/main.yml

+---
+dependencies:
+  - common
+  - supervisor