Merge pull request #367 from antoviaque/common-refactor-sandbox

Common refactor - Applies changes to edx_sandbox

playbooks/edx_sandbox.yml

@@ -23,6 +23,7 @@
     openid_workaround: True
   roles:
     - common
+    - supervisor
     - role: nginx
       nginx_sites:
       - lms
@@ -36,18 +37,6 @@
     - { role: 'edxapp', celery_worker: True }
     - oraclejdk
     - elasticsearch
-    - role: rbenv
-      rbenv_user: "{{ forum_user }}"
-      rbenv_user_home: "{{ forum_home }}"
-      rbenv_ruby_version: "{{ forum_ruby_version }}"
     - forum
-    - role: virtualenv
-      virtualenv_user: "{{ xqueue_user }}"
-      virtualenv_user_home: "{{ xqueue_user_home }}"
-      virtualenv_name: "{{ xqueue_user }}"
     - { role: "xqueue", update_users: True }
-    - role: virtualenv
-      virtualenv_user: "{{ ora_user }}"
-      virtualenv_user_home: "{{ ora_user_home }}"
-      virtualenv_name: "{{ ora_user }}"
-    - role: ora
+    - ora

playbooks/roles/edxapp/defaults/main.yml

@@ -21,6 +21,7 @@ EDXAPP_XQUEUE_BASIC_AUTH: [ 'edx', 'edx' ]
 EDXAPP_XQUEUE_DJANGO_AUTH:
   username: 'lms'
   password: 'password'
+EDXAPP_XQUEUE_URL: 'http://localhost:18040'
 
 EDXAPP_MONGO_HOSTS: ['localhost']
 EDXAPP_MONGO_PASSWORD: 'password'