changing ease namespace

playbooks/roles/ora/defaults/main.yml

@@ -7,21 +7,21 @@ ora_app_dir: "{{ app_dir }}/ora"
 ora_code_dir: "{{ ora_app_dir }}/ora"
 ora_data_dir: "{{ data_dir }}/ora"
 ora_venv_dir: "{{ venvs_dir }}/ora"
-ease_venv_dir: "{{ ora_venv_dir }}"
+ora_ease_venv_dir: "{{ ora_venv_dir }}"
 ora_venv_bin: "{{ ora_venv_dir }}/bin"
 ora_user: "ora"
-ease_code_dir: "{{ app_dir }}/ease"
-nltk_data_dir: "{{ ora_data_dir}}/nltk_data"
+ora_ease_code_dir: "{{ app_dir }}/ease"
+ora_nltk_data_dir: "{{ ora_data_dir}}/nltk_data"
 
 ora_source_repo: https://github.com/edx/edx-ora.git
 ora_version: 'HEAD'
 ora_pre_requirements_file: "{{ ora_code_dir }}/pre-requirements.txt"
 ora_post_requirements_file: "{{ ora_code_dir }}/requirements.txt"
 
-ease_source_repo: https://github.com/edx/ease.git
-ease_version: 'HEAD'
-ease_pre_requirements_file: "{{ ease_code_dir }}/pre-requirements.txt"
-ease_post_requirements_file: "{{ ease_code_dir }}/requirements.txt"
+ora_ease_source_repo: https://github.com/edx/ease.git
+ora_ease_version: 'HEAD'
+ora_ease_pre_requirements_file: "{{ ease_code_dir }}/pre-requirements.txt"
+ora_ease_post_requirements_file: "{{ ease_code_dir }}/requirements.txt"
 
 
 # Default nginx listen port
@@ -111,7 +111,7 @@ ora_debian_pkgs:
   - libatlas-base-dev
   - redis-server
 
-ease_debian_pkgs:
+ora_ease_debian_pkgs:
   - python-pip
   - gcc
   - g++

playbooks/roles/ora/tasks/ease.yml

@@ -26,34 +26,34 @@
 
 # Do A Checkout
 - name: ora | git checkout ease repo into its base dir
-  git: dest={{ease_code_dir}} repo={{ease_source_repo}} version={{ease_version}}
+  git: dest={{ora_ease_code_dir}} repo={{ora_ease_source_repo}} version={{ora_ease_version}}
   sudo_user: "{{ ora_user }}"
   tags:
   - deploy
 
 - name: ora | install ease system packages
   apt: pkg={{item}} state=present
-  with_items: ease_debian_pkgs
+  with_items: ora_ease_debian_pkgs
   tags:
   - deploy
 
 
-# Install the python pre requirements into {{ ease_venv_dir }}
+# Install the python pre requirements into {{ ora_ease_venv_dir }}
 - name: ora | install ease python pre-requirements
-  pip: requirements="{{ease_pre_requirements_file}}" virtualenv="{{ease_venv_dir}}" state=present
+  pip: requirements="{{ora_ease_pre_requirements_file}}" virtualenv="{{ora_ease_venv_dir}}" state=present
   sudo_user: "{{ ora_user }}"
   tags:
   - deploy
 
-# Install the python post requirements into {{ ease_venv_dir }}
+# Install the python post requirements into {{ ora_ease_venv_dir }}
 - name: ora | install ease python post-requirements
-  pip: requirements="{{ease_post_requirements_file}}" virtualenv="{{ease_venv_dir}}" state=present
+  pip: requirements="{{ora_ease_post_requirements_file}}" virtualenv="{{ora_ease_venv_dir}}" state=present
   sudo_user: "{{ ora_user }}"
   tags:
   - deploy
 
 - name: ora | install ease python package
-  shell: command="{{ease_venv_dir}}/bin/activate; cd {{ease_code_dir}}; python setup.py install"
+  shell: command="{{ora_ease_venv_dir}}/bin/activate; cd {{ora_ease_code_dir}}; python setup.py install"
   sudo_user: "{{ ora_user }}"
   tags:
   - deploy
@@ -67,7 +67,7 @@
 
 
 - name: ora | install nltk data using rendered shell script
-  command: "{{ease_venv_dir}}/bin/python -m nltk.downloader -d {{nltk_data_dir}} all"
+  command: "{{ora_ease_venv_dir}}/bin/python -m nltk.downloader -d {{nltk_data_dir}} all"
   when: nltk_data_installed.stdout  != "Found"
   sudo_user: "{{ ora_user }}"
   tags: