updating from master, resolving conflicts

playbooks/roles/edxapp/defaults/main.yml

@@ -149,8 +149,9 @@ edxapp_all_req_files:
 
 # TODO: old style variable syntax is necessary
 # for lists and dictionaries
+
 edxapp_environment:
-  LANG: "en_US.UTF-8"
+  LANG: $EDXAPP_LANG
   NO_PREREQ_INSTALL: 1
   SKIP_WS_MIGRATIONS: 1
   RBENV_ROOT: $edxapp_rbenv_root
@@ -158,6 +159,7 @@ edxapp_environment:
   GEM_PATH: $edxapp_gem_root
   PATH: $edxapp_deploy_path
 
+
 edxapp_generic_auth_config:  &edxapp_generic_auth
   AWS_ACCESS_KEY_ID:  $EDXAPP_AWS_ACCESS_KEY_ID
   AWS_SECRET_ACCESS_KEY: $EDXAPP_AWS_SECRET_ACCESS_KEY

playbooks/roles/jenkins_worker/tasks/system.yml

@@ -44,3 +44,9 @@
 - name: jenkins_worker | Add script to set up environment variables
   template: src=jenkins_env.sh.j2 dest=/usr/local/bin/jenkins_env.sh
             owner=root group=root mode=0555
+
+# Need to add Github to known_hosts to avoid
+# being prompted when using git through ssh
+- name: jenkins_worker | Add github.com to known_hosts if it does not exist
+  shell: >
+     ssh-keygen -f {{ jenkins_user_home }}/.ssh/known_hosts -H -F github.com | grep -q found || ssh-keyscan -H github.com > {{ jenkins_user_home }}/.ssh/known_hosts