fixing rbenv environment

playbooks/roles/common/tasks/main.yml

@@ -16,6 +16,7 @@
     - "{{ data_dir }}"
     - "{{ app_dir }}"
     - "{{ log_dir }}"
+    - "{{ venvs_dir }}"
 
 - name: common | Install role-independent useful system packages
   # do this before log dir setup; rsyslog package guarantees syslog user present

playbooks/roles/edxapp/defaults/main.yml

@@ -95,7 +95,8 @@ EDXAPP_LMS_PREVIEW_BASIC_AUTH: False
 edxapp_data_dir: "{{ data_dir }}/edxapp"
 edxapp_app_dir: "{{ app_dir }}/edxapp"
 edxapp_log_dir: "{{ log_dir }}/edxapp"
-edxapp_venv_dir: "{{ venvs_dir }}/edxapp"
+edxapp_venvs_dir: "{{ venvs_dir }}/edxapp"
+edxapp_venv_dir: "{{ edxapp_venvs_dir }}/edxapp"
 edxapp_venv_bin: "{{ edxapp_venv_dir }}/bin"
 edxapp_rbenv_dir: "{{ edxapp_app_dir }}"
 edxapp_rbenv_root: "{{ edxapp_rbenv_dir }}/.rbenv"
@@ -110,6 +111,18 @@ edxapp_course_data_dir: "{{ edxapp_data_dir }}/data"
 edxapp_upload_dir: "{{ edxapp_data_dir }}/uploads"
 edxapp_theme_dir: "{{ edxapp_data_dir }}/themes"
 
+# TODO: old style variable syntax is necessary
+# here until ansible 1.4
+edxapp_deploy_environment:
+  LANG: "en_US.UTF-8"
+  NO_PREREQ_INSTALL: 1
+  SKIP_WS_MIGRATIONS: 1
+  RBENV_ROOT: $edxapp_rbenv_root
+  GEM_HOME: $edxapp_gem_root
+  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
@@ -363,15 +376,5 @@ edxapp_ruby_version: "1.9.3-p374"
 edxapp_lms_variant: lms
 edxapp_cms_variant: cms
 
-# TODO: old style variable syntax is necessary
-# here until ansible 1.4
-edxapp_deploy_environment:
-  LANG: "en_US.UTF-8"
-  NO_PREREQ_INSTALL: 1
-  SKIP_WS_MIGRATIONS: 1
-  RBENV_ROOT: $edxapp_rbenv_root
-  GEM_HOME: $edxapp_gem_root
-  PATH: $edxapp_deploy_path
-
 # Worker Settings
 worker_django_settings_module: 'aws'

playbooks/roles/forum/defaults/main.yml

@@ -13,6 +13,7 @@ forum_path: "{{ forum_code_dir }}/bin:{{ forum_rbenv_bin }}:{{ forum_rbenv_shims
 forum_environment:
   RBENV_ROOT: $forum_rbenv_root
   GEM_HOME: $forum_gem_root
+  GEM_PATH: $forum_gem_root
   PATH: $forum_path
 
 forum_user: "forum"

playbooks/roles/rbenv/defaults/main.yml

@@ -3,7 +3,7 @@
 rbenv_version: 'v0.4.0'
 rbenv_bundler_version: '1.3.2'
 rbenv_root: "{{ rbenv_dir }}/.rbenv"
-rbenv_gem_root: "{{ rbenv_root }}/.gem"
+rbenv_gem_root: "{{ rbenv_dir }}/.gem"
 rbenv_gem_bin: "{{ rbenv_gem_root }}/bin"
 rbenv_bin: "{{ rbenv_dir }}/.rbenv/bin"
 rbenv_shims: "{{ rbenv_root }}/shims"

playbooks/roles/xqueue/defaults/main.yml

@@ -7,7 +7,8 @@ XQUEUE_BASIC_AUTH: False
 xqueue_app_dir: "{{ app_dir }}/xqueue"
 xqueue_code_dir: "{{ xqueue_app_dir }}/xqueue"
 xqueue_data_dir: "{{ data_dir }}/xqueue"
-xqueue_venv_dir: "{{ venvs_dir }}/xqueue"
+xqueue_venvs_dir: "{{ venvs_dir }}/xqueue"
+xqueue_venv_dir: "{{ xqueue_venvs_dir }}/xqueue"
 xqueue_venv_bin: "{{ xqueue_venv_dir }}/bin"
 xqueue_user: "xqueue"
 

playbooks/roles/xqueue/tasks/main.yml

@@ -20,6 +20,13 @@
     owner="{{ xqueue_user }}"
     group="{{ common_web_group }}"
 
+- name: xqueue | create xqueue venvs dir
+  file: >
+    path="{{ xqueue_venvs_dir }}"
+    state=directory
+    owner="{{ xqueue_user }}"
+    group="{{ common_web_group }}"
+
 
 - name: xqueue | install a bunch of system packages on which xqueue relies
   apt: pkg={{','.join(xqueue_debian_pkgs)}} state=present

playbooks/roles/xserver/defaults/main.yml

@@ -17,7 +17,8 @@ XSERVER_GRADER_CHECKOUT: False
 xserver_app_dir: "{{ app_dir }}/xserver"
 xserver_code_dir: "{{ xserver_app_dir }}/xserver"
 xserver_data_dir: "{{ data_dir }}/xserver"
-xserver_venv_dir: "{{ venvs_dir }}/xserver"
+xserver_venvs_dir: "{{ venvs_dir }}/xserver"
+xserver_venv_dir: "{{ xqueue_venvs_dir }}/xserver"
 xserver_venv_sandbox_dir: "{{ xserver_venv_dir }}-sandbox"
 xserver_venv_bin: "{{ xserver_venv_dir }}/bin"
 xserver_user: "xserver"