[airavata] branch develop updated: Install additional python dependencies in portal venv

[machristie]

This is an automated email from the ASF dual-hosted git repository.

machristie pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git


The following commit(s) were added to refs/heads/develop by this push:
     new 5f989cb  Install additional python dependencies in portal venv
5f989cb is described below

commit 5f989cbddaa7f02ea2cdf6b956f28a71af2c15f9
Author: Marcus Christie <machris...@apache.org>
AuthorDate: Fri Mar 15 12:43:46 2019 -0400

    Install additional python dependencies in portal venv
---
 .../inventories/scigap/develop/host_vars/simccs/vars.yml       |  3 ++-
 dev-tools/ansible/roles/django/defaults/main.yml               |  1 +
 dev-tools/ansible/roles/django/tasks/main.yml                  | 10 +++++++++-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git 
a/dev-tools/ansible/inventories/scigap/develop/host_vars/simccs/vars.yml 
b/dev-tools/ansible/inventories/scigap/develop/host_vars/simccs/vars.yml
index 26f0264..e56cadb 100644
--- a/dev-tools/ansible/inventories/scigap/develop/host_vars/simccs/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/develop/host_vars/simccs/vars.yml
@@ -19,7 +19,8 @@
 #
 
 ---
-airavata_django_git_branch: "simccs"
+airavata_django_extra_dependencies:
+  - git+https://github.com/SciGaP/simccs-maptool.git#egg=simccs-maptool
 doc_root_dir: "/data/portals/django-simccs"
 vhost_servername: "beta.simccs.org"
 vhost_ssl: True
diff --git a/dev-tools/ansible/roles/django/defaults/main.yml 
b/dev-tools/ansible/roles/django/defaults/main.yml
index 592adff..28b2b2f 100644
--- a/dev-tools/ansible/roles/django/defaults/main.yml
+++ b/dev-tools/ansible/roles/django/defaults/main.yml
@@ -60,6 +60,7 @@ oauth_callback_url: "https://{{ vhost_servername 
}}/auth/callback"
 airavata_django_repo: "https://github.com/apache/airavata-django-portal.git";
 airavata_django_git_branch: "master"
 airavata_django_checkout: "{{ doc_root_dir}}/airavata-django-portal"
+airavata_django_extra_dependencies: []
 gateway_id: "{{ default_gateway }}"
 # relative to document root dir
 experiment_data_dir: "{{ user_data_dir }}"
diff --git a/dev-tools/ansible/roles/django/tasks/main.yml 
b/dev-tools/ansible/roles/django/tasks/main.yml
index 871c5aa..f50cf94 100644
--- a/dev-tools/ansible/roles/django/tasks/main.yml
+++ b/dev-tools/ansible/roles/django/tasks/main.yml
@@ -44,6 +44,14 @@
   become: yes
   become_user: "{{user}}"
 
+- name: Install additional dependencies
+  pip:
+    name: "{{ airavata_django_extra_dependencies }}"
+    virtualenv: "{{ django_venv_dir }}"
+  become: yes
+  become_user: "{{user}}"
+  when: airavata_django_extra_dependencies | length > 0
+
 - name: Copy the settings_local.py file
   template: src={{ django_settings_local_template }} dest="{{ 
airavata_django_checkout }}/django_airavata/settings_local.py" owner="{{user}}" 
group="{{group}}"
   become: yes
@@ -126,4 +134,4 @@
   become: yes
   notify:
     - restart httpd
-  when: vhost_ssl
\ No newline at end of file
+  when: vhost_ssl