Merge pull request #2466 from edx/feanil/remove_xml_specific_logic

Remove xml course specific logic.

playbooks/roles/edxapp/tasks/deploy.yml

@@ -300,44 +300,6 @@
   when: openid_workaround is defined
   sudo_user: "{{ edxapp_user }}"
 
-# The next few tasks install xml courses.
-
-# Install the xml courses from an s3 bucket
-- name: get s3 one time url
-  s3: >
-    bucket="{{ EDXAPP_XML_S3_BUCKET }}"
-    object="{{ EDXAPP_XML_S3_KEY }}"
-    mode="geturl"
-    expiration=30
-  when: not EDXAPP_XML_FROM_GIT and EDXAPP_XML_S3_BUCKET and EDXAPP_XML_S3_KEY
-  register: s3_one_time_url
-
-- name: download from one time url
-  get_url:
-    url="{{ s3_one_time_url.url }}"
-    dest="{{ edxapp_data_dir }}/{{ EDXAPP_XML_S3_KEY|basename }}"
-    mode=0600
-  when: not EDXAPP_XML_FROM_GIT and EDXAPP_XML_S3_BUCKET and EDXAPP_XML_S3_KEY
-  register: download_xml_s3
-
-- name: unzip the data to the data dir
-  shell: >
-    tar xzf {{ edxapp_data_dir }}/{{ EDXAPP_XML_S3_KEY|basename }}
-    chdir="{{ edxapp_data_dir }}"
-  when: download_xml_s3.changed
-
-# This currently has to be done because
-# the course coffescript is compiled on the fly
-# by the application after startup.
-# See VPC-117 and VPC-122
-- name: make the course data web user writable
-  file:
-    path="{{ edxapp_course_data_dir }}"
-    state=directory
-    recurse=yes
-    owner="{{ common_web_user }}"
-    group="{{ edxapp_user }}"
-
 # creates the supervisor jobs for the
 # service variants configured, runs
 # gather_assets and db migrations
@@ -346,10 +308,6 @@
     - service_variant_config
     - deploy
 
-- include: xml.yml
-  tags: deploy
-  when: EDXAPP_XML_FROM_GIT
-
   # call supervisorctl update. this reloads
   # the supervisorctl config and restarts
   # the services if any of the configurations

playbooks/roles/edxapp/tasks/xml.yml

-- name: remove all course data before checkout
-  file:
-    path="{{ edxapp_course_data_dir }}/{{ item.repo_name }}"
-    state=absent
-  with_items: EDXAPP_XML_COURSES
-
-- name: make the course data updatable by the edxapp user
-  file:
-    path="{{ edxapp_course_data_dir }}"
-    state=directory
-    recurse=yes
-    owner="{{ edxapp_user }}"
-    group="{{ edxapp_user }}"
-
-- name: clone the xml course repo
-  git: >
-    repo="{{ item.repo_url }}"
-    dest="{{ edxapp_course_data_dir }}/{{ item.repo_name }}"
-    version="{{ item.version }}"
-    accept_hostkey=True
-  sudo_user: "{{ edxapp_user }}"
-  environment:
-    GIT_SSH: "{{ edxapp_git_ssh }}"
-  with_items: EDXAPP_XML_COURSES
-
-- name: update course.xml
-  template: >
-    src=course.xml.j2
-    dest="{{ edxapp_course_data_dir }}/{{ item.repo_name }}/course.xml"
-  sudo_user: "{{ edxapp_user }}"
-  with_items: EDXAPP_XML_COURSES
-
-- name: make symlinks for the static data
-  shell: >
-    executable=/bin/bash
-    if [[ -d {{ edxapp_course_data_dir }}/{{ item.repo_name }}/static ]]; then
-      ln -sf {{ edxapp_course_data_dir }}/{{ item.repo_name }}/static {{ edxapp_course_static_dir }}/{{ item.repo_name}}
-      ln -sf {{ edxapp_course_data_dir }}/{{ item.repo_name }}/static {{ edxapp_course_static_dir }}/{{ item.course}}
-    else
-      ln -sf {{ edxapp_course_data_dir }}/{{ item.repo_name }} {{ edxapp_course_static_dir }}/{{ item.repo_name}}
-      ln -sf {{ edxapp_course_data_dir }}/{{ item.repo_name }} {{ edxapp_course_static_dir }}/{{ item.course}}
-    fi
-  with_items: EDXAPP_XML_COURSES
-  when: item.disposition == "on disk" or item.disposition == "no static import"
-
-- name: make symlinks so code works
-  file: >
-    src="{{ edxapp_course_data_dir }}/{{ item.repo_name }}"
-    dest="{{ edxapp_course_data_dir }}/{{ item.course }}"
-    state=link
-  with_items: EDXAPP_XML_COURSES
-  when: item.disposition == "on disk" or item.disposition == "no static import"
-
-- name: import courses with nostatic flag
-  shell: >
-    {{ edxapp_venv_bin }}/python manage.py cms --settings=aws import --nostatic {{ edxapp_course_data_dir }} {{ item.repo_name }}
-    chdir="{{ edxapp_code_dir }}"
-  sudo_user: "{{ edxapp_user }}"
-  with_items: EDXAPP_XML_COURSES
-  when: item.disposition == "no static import"
-  
-- name: import courses including static data
-  shell: >
-    {{ edxapp_venv_bin }}/python manage.py cms --settings=aws import {{ edxapp_course_data_dir }} {{ item.repo_name }}
-    chdir="{{ edxapp_code_dir }}"
-  sudo_user: "{{ edxapp_user }}"
-  with_items: EDXAPP_XML_COURSES
-  when: item.disposition == "import"
-
-- name: delete courses that were fully imported
-  file: path="{{ edxapp_course_data_dir }}/{{ item.repo_name }}" state=absent
-  with_items: EDXAPP_XML_COURSES
-  when: item.disposition == "import"
-
-- name: create an archive of course data and course static dirs
-  shell: tar czf /tmp/static_course_content.tar.gz -C {{ edxapp_data_dir }} --exclude ".git" {{ edxapp_course_data_dir|basename }} {{ edxapp_course_static_dir|basename }}
-
-- name: upload archive to s3
-  s3: >
-    bucket="{{ EDXAPP_XML_S3_BUCKET }}"
-    object="{{ EDXAPP_XML_S3_KEY }}"
-    mode=put
-    overwrite=True
-    src="/tmp/static_course_content.tar.gz"
-  when: EDXAPP_XML_S3_BUCKET and EDXAPP_XML_S3_KEY
-
-- name: remove archive from disk
-  file: path="/tmp/static_course_content.tar.gz" state=absent
-  when: EDXAPP_XML_S3_BUCKET and EDXAPP_XML_S3_KEY