Merge pull request #244 from edx/jbau/edx-west/move-files-around

 edx-west file cleanup

playbooks/edx-west/xserver_prod.yml → playbooks/edx-west/cme-prod-app.yml

 # this gets all running prod webservers
-- hosts: tag_environment_prod:&tag_function_xserver
+#- hosts: tag_environment_prod:&tag_function_webserver
 # or we can get subsets of them by name
-#- hosts: ~tag_Name_xserver(1|2)_prod
-#- hosts: security_group_edx-prod-EdxappServerSecurityGroup-NSKCQTMZIPQB
+- hosts: ~tag_Name_app(10|20)_cme
   sudo: True
+  vars_prompt:
+    - name: "migrate_db"
+      prompt: "Should this playbook run database migrations? (Type 'yes' to run, anything else to skip migrations)"
+      default: "no"
+      private: no
   vars:
     secure_dir: '../../../configuration-secure/ansible'
     # this indicates the path to site-specific (with precedence)
     # things like nginx template files
     local_dir:  '../../../configuration-secure/ansible/local'
   vars_files:
-    - "{{ secure_dir }}/vars/edxapp_prod_vars.yml"
+    - "{{ secure_dir }}/vars/edxapp_cme_vars.yml"
     - "{{ secure_dir }}/vars/users.yml"
     - "{{ secure_dir }}/vars/edxapp_prod_users.yml"
   roles:
     - common
     - nginx
-    - xserver
+    - edxapp
+    # run this role last
+    - in_production

playbooks/edx-west/edxapp_prod_apache.yml

-- hosts: ~tag_Name_app(12|22)_prod
-#- hosts: security_group_edx-prod-EdxappServerSecurityGroup-NSKCQTMZIPQB
-  sudo: True
-  vars_files:
-    - "{{ secure_dir }}/vars/edxapp_prod_vars.yml"
-    - "{{ secure_dir }}/vars/users.yml"
-    - "{{ secure_dir }}/vars/edxapp_prod_users.yml"
-    - "{{ secure_dir }}/vars/shib_prod_vars.yml"
-
-  vars:
-    secure_dir: '../../../configuration-secure/ansible'
-    # this indicates the path to site-specific (with precedence)
-    # things like nginx template files
-    local_dir:  '../../../configuration-secure/ansible/local'
-
-  roles:
-    - nginx
-    - edxapp
-    - apache
-    - shibboleth
\ No newline at end of file

playbooks/edx-west/edxapp_prod_debug.yml

----
-
-#- hosts: tag_environment_prod:&tag_function_webserver:&tag_test_test
-- hosts: i-a4d28cfc
-  sudo: True
-  vars_files:
-    - "{{ secure_dir }}/vars/edxapp_prod_vars.yml"
-    - "{{ secure_dir }}/vars/users.yml"
-    - "{{ secure_dir }}/vars/edxapp_prod_users.yml"
-  roles:
-    - common
-    - nginx
-    - gunicorn
-    - edxapp
-    - ruby
-    - npm
-    # run this role last
-    - in_production
-  tasks:
-    - debug: msg="{{ lms_preview_auth_config}}"
-      tags:
-        - debug
-    - debug: msg="{{ lms_preview_env_config}}"
-      tags:
-        - debug

playbooks/edx-west/edxapp_prod_local.yml

-- hosts: tag_Name_app4_prod
-#- hosts: tag_environment_prod:&tag_function_webserver:&tag_test_test
-#- hosts: security_group_edx-prod-EdxappServerSecurityGroup-NSKCQTMZIPQB
-  sudo: True
-  vars_files:
-    - "{{ secure_dir }}/vars/edxapp_prod_vars.yml"
-    - "{{ secure_dir }}/vars/users.yml"
-    - "{{ secure_dir }}/vars/edxapp_prod_users.yml"
-  roles:
-    - common
-    - nginx
-    - gunicorn
-    - edxapp
-    - ruby
-    - npm
-    - edx-theme
-    # run this role last
-    - in_production

playbooks/edx-west/edxapp_ref.yml

-- hosts: tag_Group_edxapp_ref
-  sudo: True
-  vars_files:
-    - "{{ secure_dir }}/vars/edxapp_ref_vars.yml"
-    - "{{ secure_dir }}/vars/edxapp_ref_users.yml"
-  roles:
-    - common
-    - nginx
-    - gunicorn
-    - edxapp
-    - ruby
-    - npm
-    # run this role last
-    - in_production

playbooks/edx-west/edxutil_prod.yml

-- hosts: tag_environment_prod:&tag_function_util
-  sudo: True
-  vars_files:
-    - "{{ secure_dir }}/vars/edxapp_prod_vars.yml"
-    - "{{ secure_dir }}/vars/users.yml"
-    - "{{ secure_dir }}/vars/edxapp_prod_users.yml"
-  roles:
-    - common
-    - edxapp
-    - edx_worker_upstart
\ No newline at end of file

playbooks/edx-west/edxutil_prod_local.yml

-- hosts: tag_environment_prod:&tag_function_util
-  sudo: True
-  vars_files:
-    - "{{ secure_dir }}/vars/edxapp_prod_vars.yml"
-    - "{{ secure_dir }}/vars/users.yml"
-    - "{{ secure_dir }}/vars/edxapp_prod_users.yml"
-  roles:
-    - common
-    - edxapp
-    - edx_worker_upstart
\ No newline at end of file

playbooks/roles/edxapp/tasks/deploy.yml

@@ -24,6 +24,14 @@
   - install
   - deploy
 
+- name: git clean after checking out edx-platform
+  shell: cd {{edx_platform_code_dir}} && git clean -xdf
+  tags:
+  - lms
+  - cms
+  - install
+  - deploy
+
 # Do Post Checkout Tasks.
 - name: create platform code dir
   file: path={{edx_platform_code_dir}} state=directory owner=www-data group=www-data mode=755
@@ -31,6 +39,7 @@
   - lms
   - cms
   - install
+  - deploy
 
 - name: checkout theme
   git: dest={{app_base_dir}}/themes/{{edxapp_theme_name}} repo={{edxapp_theme_source_repo}} version={{edxapp_theme_version}}