Commit 26bf1d2f by Feanil Patel

Merge pull request #1087 from edx/feanil/xml_s3_url

Feanil/xml s3 url
parents 63811fdb 23a6fed8
...@@ -262,14 +262,14 @@ ...@@ -262,14 +262,14 @@
register: s3_one_time_url register: s3_one_time_url
- name: download from one time url - name: download from one time url
get_url: url="{{ s3_one_time_url.s3_url }}" dest="/tmp/{{ EDXAPP_XML_S3_KEY|basename }}" get_url: url="{{ s3_one_time_url.url }}" dest="/tmp/{{ EDXAPP_XML_S3_KEY|basename }}"
when: not EDXAPP_XML_FROM_GIT and EDXAPP_XML_S3_BUCKET and EDXAPP_XML_S3_KEY when: not EDXAPP_XML_FROM_GIT and EDXAPP_XML_S3_BUCKET and EDXAPP_XML_S3_KEY
register: download_xml_s3 register: download_xml_s3
- name: unzip the data to the data dir - name: unzip the data to the data dir
shell: > shell: >
tar xzf /tmp/{{ EDXAPP_XML_S3_KEY|basename }} tar xzf /tmp/{{ EDXAPP_XML_S3_KEY|basename }}
chdir="{{ edxapp_course_data_dir }}" chdir="{{ edxapp_data_dir }}"
when: download_xml_s3.changed when: download_xml_s3.changed
- include: xml.yml - include: xml.yml
......
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
when: item.disposition == "on disk" or item.disposition == "no static import" when: item.disposition == "on disk" or item.disposition == "no static import"
- name: create an archive of course data and course static dirs - name: create an archive of course data and course static dirs
shell: tar cjf /tmp/static_course_content.tar.bz2 -C {{ edxapp_data_dir }} {{ edxapp_course_data_dir|basename }} {{ edxapp_course_static_dir|basename }} shell: tar czf /tmp/static_course_content.tar.gz -C {{ edxapp_data_dir }} {{ edxapp_course_data_dir|basename }} {{ edxapp_course_static_dir|basename }}
- name: upload archive to s3 - name: upload archive to s3
s3: > s3: >
...@@ -62,9 +62,9 @@ ...@@ -62,9 +62,9 @@
object="{{ EDXAPP_XML_S3_KEY }}" object="{{ EDXAPP_XML_S3_KEY }}"
mode=put mode=put
overwrite=True overwrite=True
src="/tmp/static_course_content.tar.bz2" src="/tmp/static_course_content.tar.gz"
when: EDXAPP_XML_S3_BUCKET and EDXAPP_XML_S3_KEY when: EDXAPP_XML_S3_BUCKET and EDXAPP_XML_S3_KEY
- name: remove archive from disk - name: remove archive from disk
file: path="/tmp/static_course_content.tar.bz2" state=absent file: path="/tmp/static_course_content.tar.gz" state=absent
when: EDXAPP_XML_S3_BUCKET and EDXAPP_XML_S3_KEY when: EDXAPP_XML_S3_BUCKET and EDXAPP_XML_S3_KEY
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment