using demo course for grader

playbooks/edx-east/deploy_xserver.yml

@@ -5,4 +5,5 @@
   roles:
     - common
     - supervisor
-    - xserver
+    - role: xserver
+      tags: ['xserver']

playbooks/roles/xserver/defaults/main.yml

@@ -5,14 +5,18 @@ XSERVER_NGINX_PORT: 18050
 XSERVER_BASIC_AUTH: False
 
 XSERVER_RUN_URL: ''
-XSERVER_GRADER_ROOT: ''
 XSERVER_LOGGING_ENV: 'sandbox'
 XSERVER_SYSLOG_SERVER: ''
+# For 6.00x use "{{ xserver_data_dir }}/data/content-mit-600x~2012_Fall"
+XSERVER_GRADER_DIR: "{{ xserver_data_dir }}/data/edx-demo-course"
+# For 6.00x use "git@github.com:/MITx/6.00x.git"
+XSERVER_GRADER_SOURCE: "https://{{ COMMON_GIT_MIRROR }}/edx/edx-demo-course.git"
+
+
 # by default do not check out the content
 # repo needed on the xserver for grading
 # python submissions, TODO: replace with an open
 # source repo
-XSERVER_GRADER_CHECKOUT: False
 
 xserver_app_dir: "{{ COMMON_APP_DIR }}/xserver"
 xserver_code_dir: "{{ xserver_app_dir }}/xserver"
@@ -24,10 +28,10 @@ xserver_venv_bin: "{{ xserver_venv_dir }}/bin"
 xserver_user: "xserver"
 xserver_sandbox_user: "xserver-sandbox"
 xserver_log_dir: "{{ COMMON_LOG_DIR }}/xserver"
-
+xserver_grader_root: "{{ XSERVER_GRADER_DIR }}/graders"
 xserver_env_config:
   RUN_URL: $XSERVER_RUN_URL
-  GRADER_ROOT: $XSERVER_GRADER_ROOT
+  GRADER_ROOT: $xserver_grader_root
   LOGGING_ENV: $XSERVER_LOGGING_ENV
   LOG_DIR: "{{ xserver_log_dir }}"
   SYSLOG_SERVER: $XSERVER_SYSLOG_SERVER
@@ -37,11 +41,8 @@ xserver_git_identity_path: "{{ secure_dir }}/files/git-identity"
 xserver_source_repo: "git://github.com/edx/xserver.git"
 # This should probably be overridden in the playbook or groupvars
 # with the default pointing to the head of master.
-xserver_version: HEAD
-
-xserver_grader_dir: "{{ xserver_data_dir }}/data/content-mit-600x~2012_Fall"
-xserver_grader_source: "git@github.com:/MITx/6.00x.git"
-xserver_grader_version: HEAD
+xserver_version: master
+xserver_grader_version: master
 
 
 xserver_requirements_file: "{{ xserver_code_dir }}/requirements.txt"

playbooks/roles/xserver/tasks/deploy.yml

@@ -36,10 +36,9 @@
   - deploy
 
 - name: xserver | checkout grader code
-  git: dest={{ xserver_grader_dir }} repo={{ xserver_grader_source }} version={{ xserver_grader_version }}
+  git: dest={{ XSERVER_GRADER_DIR }} repo={{ XSERVER_GRADER_SOURCE }} version={{ xserver_grader_version }}
   environment:
     GIT_SSH: /tmp/git_ssh.sh
-  when: XSERVER_GRADER_CHECKOUT
   sudo_user: "{{ xserver_user }}"
   tags:
   - deploy

playbooks/roles/xserver/tasks/main.yml

@@ -27,6 +27,7 @@
     - "{{ xserver_app_dir }}"
     - "{{ xserver_venvs_dir }}"
     - "{{ xserver_data_dir }}"
+    - "{{ xserver_data_dir }}/data"
 
 - name: xserver | create sandbox sudoers file
   template: src=99-sandbox.j2 dest=/etc/sudoers.d/99-sandbox owner=root group=root mode=0440