Merge pull request #382 from antoviaque/common-refactor-ora

Common refactor - Fix ora & xqueue

playbooks/edx_sandbox.yml

@@ -29,6 +29,7 @@
       - lms
       - cms
       - lms-preview
+      - xqueue
       - ora
     - edxlocal
     - mongo

playbooks/roles/edxapp/defaults/main.yml

@@ -47,7 +47,7 @@ EDXAPP_EDXAPP_SECRET_KEY: ''
 
 EDXAPP_PEARSON_TEST_PASWORD: ''
 
-EDXAPP_OEE_URL: 'http://localhost:18091/'
+EDXAPP_OEE_URL: 'http://localhost:18060/'
 EDXAPP_OEE_USER: 'lms'
 EDXAPP_OEE_PASSWORD: 'password'
 

playbooks/roles/ora/defaults/main.yml

@@ -78,7 +78,7 @@ ora_auth_config:
     "django_auth":
       "password": "password"
       "username": "lms"
-    "url": "http://localhost:18091"
+    "url": "http://localhost:18060"
   'DATABASES':
     'default': { 'ENGINE': 'django.db.backends.mysql', 'NAME': 'ora', 'USER': 'root', 'PASSWORD': '', 'HOST': 'localhost', 'PORT': '3306' }
   'AWS_ACCESS_KEY_ID' : ''

playbooks/roles/ora/tasks/ease.yml

@@ -54,7 +54,7 @@
 
 - name: ora | install ease python package
   shell: >
-    {{ ora_ease_venv_dir }}/bin/activate; cd {{ ora_ease_code_dir }}; python setup.py install
+    . {{ ora_ease_venv_dir }}/bin/activate; cd {{ ora_ease_code_dir }}; python setup.py install
   sudo_user: "{{ ora_user }}"
   tags:
   - deploy

playbooks/roles/ora/templates/edx-ora.conf.j2

@@ -16,6 +16,7 @@ env ADDRESS={{ ora_gunicorn_host }}
 env LANG=en_US.UTF-8
 env DJANGO_SETTINGS_MODULE=edx_ora.aws
 env SERVICE_VARIANT=ora
+env NLTK_DATA={{ ora_nltk_data_dir }}
 
 pre-start script
 end script

playbooks/roles/xqueue/defaults/main.yml

@@ -32,7 +32,8 @@ XQUEUE_S3_PATH_PREFIX: 'sandbox-xqueue'
 XQUEUE_LOCAL_LOGLEVEL: 'INFO'
 XQUEUE_AWS_ACCESS_KEY_ID : ''
 XQUEUE_AWS_SECRET_ACCESS_KEY : ''
-XQUEUE_BASIC_AUTH: ['edx', 'edx']
+XQUEUE_BASIC_AUTH_USER: 'edx'
+XQUEUE_BASIC_AUTH_PASSWORD: 'edx'
 XQUEUE_DJANGO_USER: 'lms'
 XQUEUE_DJANGO_PASSWORD: 'password'
 XQUEUE_RABBITMQ_USER: 'edx'
@@ -59,7 +60,7 @@ xqueue_env_config:
 xqueue_auth_config:
   AWS_ACCESS_KEY_ID:  $XQUEUE_AWS_ACCESS_KEY_ID
   AWS_SECRET_ACCESS_KEY: $XQUEUE_AWS_SECRET_ACCESS_KEY
-  REQUESTS_BASIC_AUTH: $XQUEUE_BASIC_AUTH
+  REQUESTS_BASIC_AUTH: [$XQUEUE_BASIC_AUTH_USER, $XQUEUE_BASIC_AUTH_PASSWORD]
   USERS: { '{{XQUEUE_DJANGO_USER}}' : $XQUEUE_DJANGO_PASSWORD }
   DATABASES:
     default: