using role dependencies for common/supervisor

Also renaming the deploy_* plays to the play name

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

+dependencies:
+  - common
+  - supervisor

playbooks/roles/devpi/meta/main.yml

 ---
 dependencies:
+  - common
   - role: supervisor
     supervisor_app_dir: "{{ devpi_supervisor_app_dir }}"
     supervisor_data_dir: "{{ devpi_supervisor_data_dir }}"

playbooks/roles/discern/meta/main.yml

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

playbooks/roles/edxapp/meta/main.yml

 ---
 dependencies:
+  - common
+  - 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:
+  - common
+  - supervisor
   - role: rbenv
     # TODO: setting the rbenv ownership to
     # the common_web_user is a workaround

playbooks/roles/mongo/meta/main.yml

+---
+dependencies:
+  - common

playbooks/roles/nginx/meta/main.yml

+---
+dependencies:
+  - common

playbooks/roles/ora/meta/main.yml

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

playbooks/roles/rabbitmq/meta/main.yml

+---
+dependencies:
+  - common

playbooks/roles/xqueue/meta/main.yml

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

playbooks/roles/xserver/meta/main.yml

+---
+dependencies:
+  - common
+  - 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

@@ -119,7 +119,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
@@ -143,7 +143,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