[airavata] 02/02: Merge branch 'airavata-3319' into develop

[ma...@apache.org]

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

commit 25464e4665f0de37df7ce45b16aeea28d2efa8b0
Merge: 91cf0d1 2dee29e
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Mon Jul 26 13:46:42 2021 -0400

    Merge branch 'airavata-3319' into develop

 .../services/core/impl/TenantManagementKeycloakImpl.java     |  1 +
 .../scigap/production/host_vars/global-flood/vars.yml        | 12 ++++++------
 .../inventories/scigap/production/host_vars/immune/vars.yml  |  3 +++
 .../inventories/scigap/production/host_vars/regsnps/vars.yml |  3 +++
 .../inventories/scigap/production/host_vars/simccs/vars.yml  |  5 ++---
 .../ansible/roles/django/templates/django-ssl-vhost.conf.j2  |  3 +++
 .../ansible/roles/django/templates/django-vhost.conf.j2      |  3 +++
 7 files changed, 21 insertions(+), 9 deletions(-)

diff --cc dev-tools/ansible/inventories/scigap/production/host_vars/simccs/vars.yml
index 2662f40,158f993..fa3746c
--- a/dev-tools/ansible/inventories/scigap/production/host_vars/simccs/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/host_vars/simccs/vars.yml
@@@ -24,9 -24,8 +24,8 @@@
  gateway_data_store_hostname: "scigap11.sciencegateways.iu.edu"
  gateway_data_store_resource_id: "scigap11.sciencegateways.iu.edu_96b8dcec-ac84-438a-9927-91baaf87758b"
  
 -django_tus_endpoint: "https://tus.simccs.scigap.org/files/"
 +tusd_vhost_servername: "tus.simccs.scigap.org"
- # simccs_maptool_branch: "master"
- simccs_maptool_branch: "dev"
+ simccs_maptool_branch: "master"
  airavata_django_extra_dependencies:
    # Need to separately install cython in the VM or do two deploys, one with
    # just cython, then a second with the other dependencies. Reason: pyjnius