Merge pull request #474 from edx/jarv/grade-download

Jarv/grade download

playbooks/edx-east/edx_provision.yml

@@ -15,6 +15,7 @@
       dns_name: "{{ dns_name }}"
       dns_zone: "{{ dns_zone }}"
       terminate_instance: true
+      instance_profile_name: sandbox
 
 - name: Configure instance(s)
   hosts: launched

playbooks/roles/edxapp/defaults/main.yml

@@ -68,6 +68,7 @@ EDXAPP_MITX_FEATURES:
   SUBDOMAIN_BRANDING: false
   SUBDOMAIN_COURSE_LISTINGS: false
   PREVIEW_LMS_BASE: $EDXAPP_PREVIEW_LMS_BASE
+  ENABLE_S3_GRADE_DOWNLOADS: true
 
 EDXAPP_BOOK_URL: ''
 # This needs to be set to localhost
@@ -110,6 +111,11 @@ EDXAPP_MKTG_URL_LINK_MAP: {}
 # Example: xxxxx.cloudfront.net/static/
 EDXAPP_STATIC_URL_BASE: "/static/"
 
+# Settings for Grade downloads
+EDXAPP_GRADE_STORAGE_TYPE: 'localfs'
+EDXAPP_GRADE_BUCKET: 'edx-grades'
+EDXAPP_GRADE_ROOT_PATH: '/tmp/edx-s3/grades'
+
 #-------- Everything below this line is internal to the role ------------
 
 #Use YAML references (& and *) and hash merge <<: to factor out shared settings
@@ -262,6 +268,10 @@ edxapp_generic_auth_config:  &edxapp_generic_auth
   CELERY_BROKER_PASSWORD: $EDXAPP_CELERY_PASSWORD
 
 generic_env_config:  &edxapp_generic_env
+  GRADES_DOWNLOAD:
+    STORAGE_TYPE: $EDXAPP_GRADE_STORAGE_TYPE
+    BUCKET: $EDXAPP_GRADE_BUCKET
+    ROOT_PATH: $EDXAPP_GRADE_ROOT_PATH
   STATIC_URL_BASE: $EDXAPP_STATIC_URL_BASE
   STATIC_ROOT_BASE: $edxapp_staticfile_dir
   LMS_BASE: $EDXAPP_LMS_BASE

playbooks/roles/launch_ec2/tasks/main.yml

@@ -46,6 +46,7 @@
     instance_tags: "{{instance_tags}}"
     root_ebs_size: "{{ root_ebs_size }}"
     zone: "{{ zone }}"
+    instance_profile_name: "{{ instance_profile_name }}"
   register: ec2
 
 - name: launch_ec2 | Add DNS name

util/jenkins/create-var-file.sh

@@ -32,4 +32,10 @@ rabbitmq_ip: "127.0.0.1"
 rabbitmq_refresh: True
 COMMON_HOSTNAME: edx-server
 EDXAPP_STATIC_URL_BASE: $static_url_base
+
+# Settings for Grade downloads
+EDXAPP_GRADE_STORAGE_TYPE: 's3'
+EDXAPP_GRADE_BUCKET: 'edx-grades'
+EDXAPP_GRADE_ROOT_PATH: 'sandbox'
+
 EOF