Commit d080287d by John Jarvis

Merge pull request #550 from edx/jarv/ora-download

only download ora when it hasn't already been downloaded
parents debdb86a 9ecc9cff
...@@ -44,3 +44,7 @@ common_web_group: www-data ...@@ -44,3 +44,7 @@ common_web_group: www-data
common_log_user: syslog common_log_user: syslog
common_git_ppa: "ppa:git-core/ppa" common_git_ppa: "ppa:git-core/ppa"
# Skip supervisor tasks
# Useful when supervisor is not installed (local dev)
devstack: False
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
- deploy - deploy
#Numpy has to be a pre-requirement in order for scipy to build #Numpy has to be a pre-requirement in order for scipy to build
- name : install python pre-requirements for discern and ease - name : discern | install python pre-requirements for discern and ease
pip: requirements={{item}} virtualenv={{ discern_venv_dir }} state=present pip: requirements={{item}} virtualenv={{ discern_venv_dir }} state=present
sudo_user: "{{ discern_user }}" sudo_user: "{{ discern_user }}"
notify: notify:
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
tags: tags:
- deploy - deploy
- name : install python requirements for discern and ease - name : discern | install python requirements for discern and ease
pip: requirements={{item}} virtualenv={{ discern_venv_dir }} state=present pip: requirements={{item}} virtualenv={{ discern_venv_dir }} state=present
sudo_user: "{{ discern_user }}" sudo_user: "{{ discern_user }}"
notify: notify:
...@@ -75,6 +75,7 @@ ...@@ -75,6 +75,7 @@
- name: discern | install nltk data using rendered shell script - name: discern | install nltk data using rendered shell script
shell: > shell: >
{{ discern_venv_dir }}/bin/python -m nltk.downloader -d {{ discern_nltk_data_dir }} all {{ discern_venv_dir }}/bin/python -m nltk.downloader -d {{ discern_nltk_data_dir }} all
creates={{ discern_nltk_data_dir }}/taggers/maxent_treebank_pos_tagger/english.pickle
sudo_user: "{{ discern_user }}" sudo_user: "{{ discern_user }}"
notify: notify:
- discern | restart discern - discern | restart discern
......
...@@ -475,6 +475,3 @@ edxapp_cms_variant: cms ...@@ -475,6 +475,3 @@ edxapp_cms_variant: cms
# Worker Settings # Worker Settings
worker_django_settings_module: 'aws' worker_django_settings_module: 'aws'
# Skip supervisor tasks
# Useful when supervisor is not installed (local dev)
devstack: False
...@@ -57,7 +57,3 @@ forum_services: ...@@ -57,7 +57,3 @@ forum_services:
- {service: "mongo", host: "{{ FORUM_MONGO_HOST }}", port: "28017"} - {service: "mongo", host: "{{ FORUM_MONGO_HOST }}", port: "28017"}
- {service: "elasticsearch", host: "{{ forum_elasticsearch_host }}", port: "9200"} - {service: "elasticsearch", host: "{{ forum_elasticsearch_host }}", port: "9200"}
- {service: "elasticsearch", host: "{{ forum_elasticsearch_host }}", port: "9300"} - {service: "elasticsearch", host: "{{ forum_elasticsearch_host }}", port: "9300"}
# Skip supervisor tasks
# Used in local dev where supervisor isn't installed
devstack: False
...@@ -48,20 +48,10 @@ ...@@ -48,20 +48,10 @@
tags: tags:
- deploy - deploy
#Needed for the ease package to work
- name: ora | check for the existence of nltk data taggers/maxent_treebank_pos_tagger/english.pickle
shell: "[ -f {{ ora_nltk_data_dir }}/taggers/maxent_treebank_pos_tagger/english.pickle ] && echo 'Found' || echo ''"
register: ora_nltk_data_installed
notify:
- ora | restart ora
- ora | restart ora_celery
tags:
- deploy
- name: ora | install nltk data using rendered shell script - name: ora | install nltk data using rendered shell script
command: "{{ora_ease_venv_dir}}/bin/python -m nltk.downloader -d {{ ora_nltk_data_dir }} all" command: >
when: ora_nltk_data_installed.stdout != "Found" "{{ora_ease_venv_dir}}/bin/python -m nltk.downloader -d {{ ora_nltk_data_dir }} all"
creates={{ ora_nltk_data_dir }}/taggers/maxent_treebank_pos_tagger/english.pickle
sudo_user: "{{ common_web_user }}" sudo_user: "{{ common_web_user }}"
notify: notify:
- ora | restart ora - ora | restart ora
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment