Pull in 6.00x using git ssh.

playbooks/roles/common/files/git_ssh.sh

+#!/bin/sh
+exec /usr/bin/ssh -o StrictHostKeyChecking=no -i /etc/git-identity "$@"

playbooks/roles/common/tasks/main.yml

@@ -78,6 +78,24 @@
   - logging
   - update
 
+# Install ssh keys for ubuntu account to be able to check out from edx-platform
+# Temprory behavior, not needed after June 1. Perhaps still useful as a recipe.
+# {{ secure_dir }} is relative to the top-level playbooks dir so there is some
+
+- name: install read-only ssh key for edx-platform repo (private)
+  copy: src={{ secure_dir }}/files/git-identity dest=/etc/git-identity force=yes owner=ubuntu group=adm mode=600
+  tags:
+  - lms
+  - cms
+  - update
+
+- name: upload ssh script
+  copy: src=git_ssh.sh dest=/tmp/git_ssh.sh force=yes owner=root group=adm mode=750
+  tags:
+  - lms
+  - cms
+  - update
+
 - include: create_venv.yml
 - include: edx_logging_base.yml
 

playbooks/roles/edxapp/tasks/main.yml

@@ -28,24 +28,6 @@
   - lms-env
   - update
 
-# Install ssh keys for ubuntu account to be able to check out from edx-platform
-# Temprory behavior, not needed after June 1. Perhaps still useful as a recipe.
-# {{ secure_dir }} is relative to the top-level playbooks dir so there is some
-
-- name: install read-only ssh key for edx-platform repo (private)
-  copy: src={{ secure_dir }}/files/git-identity dest=/etc/git-identity force=yes owner=ubuntu group=adm mode=600
-  tags:
-  - lms
-  - cms
-  - update
-
-- name: upload ssh script
-  copy: src=git_ssh.sh dest=/tmp/git_ssh.sh force=yes owner=root group=adm mode=750
-  tags:
-  - lms
-  - cms
-  - update
-
 - name: install a bunch of system packages on which LMS and CMS rely
   apt: pkg={{item}} state=present
   with_items: lms_debian_pkgs

playbooks/roles/xserver/tasks/deploy.yml

@@ -25,6 +25,8 @@
 
 - name: checkout grader code
   git: dest={{ xserver_grader_dir }} repo={{ xserver_grader_source }} version={{ xserver_grader_version }}
+  environment:
+    GIT_SSH: /tmp/git_ssh.sh
   tags:
   - deploy
 

playbooks/roles/xserver/vars/main.yml

@@ -8,8 +8,8 @@ xserver_source_repo: "git://github.com/edx/xserver.git"
 # with the default pointing to the head of master.
 xserver_version: HEAD
 
-xserver_grader_dir: "{{ app_base_dir }}/data/content-mit-600x~2012_Fall/graders"
-xserver_grader_source: "git://github.com/MITx/6.00x.git"
+xserver_grader_dir: "{{ app_base_dir }}/data/content-mit-600x~2012_Fall"
+xserver_grader_source: "git@github.com:/MITx/6.00x.git"
 xserver_grader_version: HEAD
 
 xserver_sandbox_venv_dir: "{{ venv_dir }}_apparmor_sandbox"