You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2022/07/29 18:11:30 UTC
[airavata] branch master updated (562fd93dec -> 31ce2c589c)
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/airavata.git
from 562fd93dec Adding BayesPrism Gateway
add b308844e03 Fix for AIRAVATA-3617
add 181a8c342d Merge branch 'AIRAVATA-3549' into develop
add 7a191a7f84 Merge branch 'AIRAVATA-3549' into develop
add 3ed6a1263b Merge branch 'develop' of https://github.com/apache/airavata into develop
add 887e1fce40 Relevant changes from htcondor branch
add b393b53850 Merge branch 'AIRAVATA-3549' into develop
add dd4a90293f Merge branch 'AIRAVATA-3570' into develop
add 0f346c5920 Ansible: adding Dinuka to dev amp error emails
add 5139eb26b1 Merge branch 'AIRAVATA-3549' into develop
add f2a94f513a Merge branch 'AIRAVATA-3549' into develop
add 8dd08145ca AIRAVATA-3549 Regenerated thrift stubs, publishing python sdk 1.0.2
add ad70ca781d Merge branch 'AIRAVATA-3585' into develop
add 75ba6c2c2d Merge branch 'master' into develop
add 1f230a3740 Merge branch 'master' into develop
add d3b6d1d17e Ansible: trecx app id for dev amos gateway
add 480e0e3e8e Ansible: disabling usd deploy until we get valid certs
add f6cb3fc1a9 Merge branch 'develop' of https://github.com/apache/airavata into pythonSDK
add 3ffe25098b Merge pull request #292 from isururanawaka/pythonSDK
add 4d130b3374 Merge branch 'AIRAVATA-3622' into develop
add 7f5fc29bf6 Added the new branch for gateway update
add db817edbb5 Ansible: redirect global floods home page to app
add 8ed824376d Externalizing maximum archive size for Archive task
add 0af936c9d3 Merge branch 'openjdk-yum-cron' into develop
add 1a00507107 Handling special characters in output staging
add 8616c5a743 Updated the readme file related to the new less secure gmail accounts
add 5fe936fdb5 Fix enum constant issue when running JobMonitorStarter
add 752ea1f9ee Initial JS2 development ansibles
add c8e51dcd0c Ansible: reenable beta usd portal
add 9b8e7522ff WIP: Ansible Database changes for Rocky Linux
add 73761df377 Completed database ansibles for Rocky linux
add 0a9cbeefa2 Fix ansible to work with JS2 Rocky VMs
add c07353066f ansible modification for api server and keycloak
add dcba17a72d Merge pull request #322 from isururanawaka/develop
add c90bdc6737 AIRAVATA-3609 Allow configuring editable django app installs
add ed1e86aa16 AIRAVATA-3609 Fix delegation of database setup tasks for Ansible 2.13
add 45f8dac6d1 AIRAVATA-3609 keycloak updates for js2, switched to systemd for init script
add bb1366355e AIRAVATA-3609 fix installing Java for Keycloak
add 65134efef9 AIRAVATA-3609 Ansible 2.13/Rocky Linux 8 updates for Django deploy
add 834c381b1b Merge branch 'AIRAVATA-3609-develop-inventory' into develop
add da6231272a AIRAVATA-3609 mark custom django apps editable in develop inv
add 5cddfe352d Ansible: js2 inventory for django portals, keycloak
add 7ac5d08b51 Ansible: js2 inventory for Django portals
add c02b3a5674 Merge branch 'AIRAVATA-3609-develop-inventory' into develop
add 8ab4ae1b86 Ansible: removing duplicate value
add c0dc2e0734 Ansible: fixing dnf cron setup
add 58835358ce Ansible: fixing python3-mysql install
add 0ca0d99253 Ansible: update the dev portal email account
add 2f8ea5cb14 AIRAVATA-3609 Fix database.yml for Rocky
add ba7f8874b0 Ansible: switching keycloak domain back to iamdev.scigap.org
add 7f2ff24064 Updating java mail version to compatible with java 11 security protocols
add 474c32e0bc Updating java mail version to compatible with java 11 security protocols
add 281cfc33b0 Adding mail-api jar to email monitor distribution
add b4daebd25a Adding missing jar for email monitor
add a2fc565bc2 AIRAVATA-3609 Fix Rocky Linux detection and failure checking
add 6521fc1fb7 Ansible: allow configuring multiple user storages
add 02c9f3312a Ansible: adding deprecation note
add 45882f7ebe AIRAVATA-3609 include -> include_tasks, fixes deprecation warning
add 3a8f3436cb Ansible: dev amp migrated to js2
add caff5027a9 Ansible: update seagrid admin email to circ
new 2a66a2a1c8 Merge branch 'develop'
new bd03950321 AIRAVATA-3609 mark custom django apps editable in production inv
new 31ce2c589c Merge branch 'AIRAVATA-3609-production-inventory'
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../airavata/api/Airavata-remote | 22 +-
.../airavata-python-sdk/airavata/api/Airavata.py | 1778 ++++++++++++++------
.../model/appcatalog/computeresource/ttypes.py | 3 +
.../airavata/model/messaging/event/ttypes.py | 101 ++
.../airavata/model/workspace/ttypes.py | 90 +
.../airavata_sdk/clients/keycloak_token_fetcher.py | 9 +-
.../samples/create_launch_echo_experiment.py | 2 +-
.../samples/resources/incommon_rsa_server_ca.pem | 152 +-
.../airavata-python-sdk/requirements.txt | 3 +-
.../airavata-python-sdk/setup.py | 2 +-
.../{develop => develop-js2}/files/airavata.jks | 0
.../files/airavata_sym.jks | 0
.../files/client_truststore.jks | Bin
.../{develop => develop-js2}/files/keycloak.jks | 0
.../group_vars/all/vars.yml | 8 +-
.../group_vars/all/vault.yml | 0
.../group_vars/django/vars.yml | 28 +-
.../scigap/develop-js2/group_vars/django/vault.yml | 10 +
.../host_vars/amp/vars.yml | 39 +-
.../scigap/develop-js2/host_vars/amp/vault.yml | 12 +
.../host_vars/csbglsu/vars.yml | 6 -
.../scigap/develop-js2/host_vars/csbglsu/vault.yml | 12 +
.../host_vars/custos-testdrive/vars.yml | 6 -
.../host_vars/custos-testdrive/vault.yml | 12 +
.../host_vars/cyberwater/vars.yml | 6 -
.../develop-js2/host_vars/cyberwater/vault.yml | 12 +
.../host_vars/delta/vars.yml | 6 -
.../scigap/develop-js2/host_vars/delta/vault.yml | 12 +
.../host_vars/geo/vars.yml | 25 +-
.../scigap/develop-js2/host_vars/geo/vault.yml | 12 +
.../host_vars/interactwel/vars.yml | 21 +-
.../develop-js2/host_vars/interactwel/vault.yml | 12 +
.../host_vars/mines/vars.yml | 6 -
.../scigap/develop-js2/host_vars/mines/vault.yml | 12 +
.../host_vars/nexttdb/vars.yml | 6 -
.../scigap/develop-js2/host_vars/nexttdb/vault.yml | 12 +
.../host_vars/pfec-hydro/vars.yml | 6 -
.../develop-js2/host_vars/pfec-hydro/vault.yml | 12 +
.../host_vars/rnamake}/vars.yml | 23 +-
.../scigap/develop-js2/host_vars/rnamake/vault.yml | 12 +
.../host_vars/saver-x/vars.yml | 6 -
.../scigap/develop-js2/host_vars/saver-x/vault.yml | 12 +
.../host_vars/seagrid/vars.yml | 18 +-
.../scigap/develop-js2/host_vars/seagrid/vault.yml | 12 +
.../simccs/files/django-ssl-vhost.conf.j2 | 0
.../host_vars/simccs/vars.yml | 18 +-
.../scigap/develop-js2/host_vars/simccs/vault.yml | 12 +
.../host_vars/simvascular/vars.yml | 6 -
.../develop-js2/host_vars/simvascular/vault.yml | 12 +
.../host_vars/usd/vars.yml | 6 -
.../scigap/develop-js2/host_vars/usd/vault.yml | 12 +
.../ansible/inventories/scigap/develop-js2/hosts | 40 +
.../pga_config/scigap/vars.yml | 0
.../pga_config/scigap/vault.yml | 0
.../scigap/develop/group_vars/all/vars.yml | 3 +
.../scigap/develop/host_vars/amp/vars.yml | 6 +-
.../scigap/develop/host_vars/geo/vars.yml | 5 +-
.../scigap/production/group_vars/all/vars.yml | 3 +
.../production/host_vars/ampgateway/vars.yml | 4 +-
.../scigap/production/host_vars/geo/vars.yml | 3 +-
.../scigap/production/host_vars/immune/vars.yml | 3 +-
.../scigap/production/host_vars/lrose/vars.yml | 3 +-
.../host_vars/microbial-genomes/vars.yml | 3 +-
.../scigap/production/host_vars/regsnps/vars.yml | 3 +-
.../scigap/production/host_vars/simccs/vars.yml | 7 +-
.../scigap/production/host_vars/testdrive/vars.yml | 3 +-
dev-tools/ansible/keycloak.yml | 1 -
dev-tools/ansible/requirements.txt | 20 +-
dev-tools/ansible/roles/api-orch/tasks/main.yml | 19 +-
dev-tools/ansible/roles/common/tasks/main.yml | 10 +-
.../ansible/roles/database/tasks/keycloak.yml | 5 +-
dev-tools/ansible/roles/database/tasks/main.yml | 54 +-
dev-tools/ansible/roles/database/vars/main.yml | 3 +-
dev-tools/ansible/roles/django/tasks/database.yml | 16 +-
.../django/tasks/install_deps_Centos_7.yml} | 12 +-
.../tasks/install_deps_Rocky_8.yml} | 10 +-
dev-tools/ansible/roles/django/tasks/main.yml | 29 +-
.../roles/django/templates/settings_local.py.j2 | 13 +
..._deps_CentOS_7.yml => install_deps_Rocky_8.yml} | 6 +-
.../ansible/roles/django_setup/tasks/main.yml | 2 +-
.../tasks/files/{yum-cron.conf => dnf-cron.conf} | 8 +-
dev-tools/ansible/roles/env_setup/tasks/main.yml | 26 +-
.../ansible/roles/helix_setup/defaults/main.yml | 2 +
.../participant/airavata-server.properties.j2 | 1 +
..._deps_CentOS_7.yml => install_deps_Rocky_8.yml} | 8 +-
dev-tools/ansible/roles/httpd/tasks/main.yml | 7 +-
dev-tools/ansible/roles/java/tasks/main.yml | 11 +-
dev-tools/ansible/roles/java/vars/main.yml | 3 +
dev-tools/ansible/roles/keycloak/defaults/main.yml | 1 +
dev-tools/ansible/roles/keycloak/tasks/main.yml | 83 +-
.../templates/keycloak.service.j2} | 4 +-
.../letsencrypt/tasks/install_deps_CentOS_7.yml} | 15 +-
.../letsencrypt/tasks/install_deps_Rocky_8.yml} | 15 +-
dev-tools/ansible/roles/letsencrypt/tasks/main.yml | 15 +-
dev-tools/ansible/roles/rabbitmq/tasks/main.yml | 16 +-
.../helix/impl/task/staging/DataStagingTask.java | 17 +-
.../impl/task/staging/OutputDataStagingTask.java | 11 +-
.../main/assembly/email-monitor-bin-assembly.xml | 3 +-
modules/ide-integration/README.md | 6 +-
.../src/main/resources/email-config.yaml | 2 +-
modules/job-monitor/email-monitor/pom.xml | 6 +-
.../src/main/resources/email-config.yaml | 2 +-
modules/job-monitor/pom.xml | 9 +-
103 files changed, 2241 insertions(+), 920 deletions(-)
copy dev-tools/ansible/inventories/scigap/{develop => develop-js2}/files/airavata.jks (100%)
copy dev-tools/ansible/inventories/scigap/{develop => develop-js2}/files/airavata_sym.jks (100%)
copy dev-tools/ansible/inventories/scigap/{develop => develop-js2}/files/client_truststore.jks (100%)
copy dev-tools/ansible/inventories/scigap/{develop => develop-js2}/files/keycloak.jks (100%)
copy dev-tools/ansible/inventories/scigap/{develop => develop-js2}/group_vars/all/vars.yml (98%)
copy dev-tools/ansible/inventories/scigap/{develop => develop-js2}/group_vars/all/vault.yml (100%)
copy dev-tools/ansible/inventories/scigap/{production => develop-js2}/group_vars/django/vars.yml (63%)
create mode 100644 dev-tools/ansible/inventories/scigap/develop-js2/group_vars/django/vault.yml
copy dev-tools/ansible/inventories/scigap/{develop => develop-js2}/host_vars/amp/vars.yml (56%)
create mode 100644 dev-tools/ansible/inventories/scigap/develop-js2/host_vars/amp/vault.yml
copy dev-tools/ansible/inventories/scigap/{develop => develop-js2}/host_vars/csbglsu/vars.yml (89%)
create mode 100644 dev-tools/ansible/inventories/scigap/develop-js2/host_vars/csbglsu/vault.yml
copy dev-tools/ansible/inventories/scigap/{develop => develop-js2}/host_vars/custos-testdrive/vars.yml (89%)
create mode 100644 dev-tools/ansible/inventories/scigap/develop-js2/host_vars/custos-testdrive/vault.yml
copy dev-tools/ansible/inventories/scigap/{develop => develop-js2}/host_vars/cyberwater/vars.yml (87%)
create mode 100644 dev-tools/ansible/inventories/scigap/develop-js2/host_vars/cyberwater/vault.yml
copy dev-tools/ansible/inventories/scigap/{develop => develop-js2}/host_vars/delta/vars.yml (90%)
create mode 100644 dev-tools/ansible/inventories/scigap/develop-js2/host_vars/delta/vault.yml
copy dev-tools/ansible/inventories/scigap/{develop => develop-js2}/host_vars/geo/vars.yml (65%)
create mode 100644 dev-tools/ansible/inventories/scigap/develop-js2/host_vars/geo/vault.yml
copy dev-tools/ansible/inventories/scigap/{develop => develop-js2}/host_vars/interactwel/vars.yml (69%)
create mode 100644 dev-tools/ansible/inventories/scigap/develop-js2/host_vars/interactwel/vault.yml
copy dev-tools/ansible/inventories/scigap/{develop => develop-js2}/host_vars/mines/vars.yml (87%)
create mode 100644 dev-tools/ansible/inventories/scigap/develop-js2/host_vars/mines/vault.yml
copy dev-tools/ansible/inventories/scigap/{develop => develop-js2}/host_vars/nexttdb/vars.yml (87%)
create mode 100644 dev-tools/ansible/inventories/scigap/develop-js2/host_vars/nexttdb/vault.yml
copy dev-tools/ansible/inventories/scigap/{develop => develop-js2}/host_vars/pfec-hydro/vars.yml (89%)
create mode 100644 dev-tools/ansible/inventories/scigap/develop-js2/host_vars/pfec-hydro/vault.yml
copy dev-tools/ansible/inventories/scigap/{staging/host_vars/testdrive => develop-js2/host_vars/rnamake}/vars.yml (67%)
create mode 100644 dev-tools/ansible/inventories/scigap/develop-js2/host_vars/rnamake/vault.yml
copy dev-tools/ansible/inventories/scigap/{develop => develop-js2}/host_vars/saver-x/vars.yml (89%)
create mode 100644 dev-tools/ansible/inventories/scigap/develop-js2/host_vars/saver-x/vault.yml
copy dev-tools/ansible/inventories/scigap/{develop => develop-js2}/host_vars/seagrid/vars.yml (72%)
create mode 100644 dev-tools/ansible/inventories/scigap/develop-js2/host_vars/seagrid/vault.yml
copy dev-tools/ansible/inventories/scigap/{develop => develop-js2}/host_vars/simccs/files/django-ssl-vhost.conf.j2 (100%)
copy dev-tools/ansible/inventories/scigap/{develop => develop-js2}/host_vars/simccs/vars.yml (85%)
create mode 100644 dev-tools/ansible/inventories/scigap/develop-js2/host_vars/simccs/vault.yml
copy dev-tools/ansible/inventories/scigap/{develop => develop-js2}/host_vars/simvascular/vars.yml (86%)
create mode 100644 dev-tools/ansible/inventories/scigap/develop-js2/host_vars/simvascular/vault.yml
copy dev-tools/ansible/inventories/scigap/{develop => develop-js2}/host_vars/usd/vars.yml (89%)
create mode 100644 dev-tools/ansible/inventories/scigap/develop-js2/host_vars/usd/vault.yml
create mode 100644 dev-tools/ansible/inventories/scigap/develop-js2/hosts
copy dev-tools/ansible/inventories/scigap/{develop => develop-js2}/pga_config/scigap/vars.yml (100%)
copy dev-tools/ansible/inventories/scigap/{develop => develop-js2}/pga_config/scigap/vault.yml (100%)
copy dev-tools/ansible/{pga.yml => roles/django/tasks/install_deps_Centos_7.yml} (88%)
copy dev-tools/ansible/roles/{zabbix/defaults/main.yml => django/tasks/install_deps_Rocky_8.yml} (81%)
copy dev-tools/ansible/roles/django_setup/tasks/{install_deps_CentOS_7.yml => install_deps_Rocky_8.yml} (94%)
copy dev-tools/ansible/roles/env_setup/tasks/files/{yum-cron.conf => dnf-cron.conf} (97%)
copy dev-tools/ansible/roles/httpd/tasks/{install_deps_CentOS_7.yml => install_deps_Rocky_8.yml} (86%)
copy dev-tools/ansible/roles/{tusd/templates/tus.service.j2 => keycloak/templates/keycloak.service.j2} (89%)
copy dev-tools/ansible/{airavata-iam-setup.yml => roles/letsencrypt/tasks/install_deps_CentOS_7.yml} (75%)
copy dev-tools/ansible/{airavata-iam-setup.yml => roles/letsencrypt/tasks/install_deps_Rocky_8.yml} (79%)
[airavata] 03/03: Merge branch 'AIRAVATA-3609-production-inventory'
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata.git
commit 31ce2c589c73429e6b366e002ebccbaa21f066d0
Merge: 2a66a2a1c8 bd03950321
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Fri Jul 29 14:10:36 2022 -0400
Merge branch 'AIRAVATA-3609-production-inventory'
.../inventories/scigap/production/host_vars/ampgateway/vars.yml | 4 ++--
.../ansible/inventories/scigap/production/host_vars/geo/vars.yml | 3 ++-
.../inventories/scigap/production/host_vars/immune/vars.yml | 3 ++-
.../ansible/inventories/scigap/production/host_vars/lrose/vars.yml | 3 ++-
.../scigap/production/host_vars/microbial-genomes/vars.yml | 3 ++-
.../inventories/scigap/production/host_vars/regsnps/vars.yml | 3 ++-
.../inventories/scigap/production/host_vars/simccs/vars.yml | 7 ++++---
.../inventories/scigap/production/host_vars/testdrive/vars.yml | 3 ++-
8 files changed, 18 insertions(+), 11 deletions(-)
[airavata] 01/03: AIRAVATA-3609 mark custom django apps editable in production inv
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata.git
commit bd039503216f36ffa448d8ce891c8f58218468c2
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Thu Jun 30 16:33:58 2022 -0400
AIRAVATA-3609 mark custom django apps editable in production inv
---
.../inventories/scigap/production/host_vars/ampgateway/vars.yml | 4 ++--
.../ansible/inventories/scigap/production/host_vars/geo/vars.yml | 3 ++-
.../inventories/scigap/production/host_vars/immune/vars.yml | 3 ++-
.../ansible/inventories/scigap/production/host_vars/lrose/vars.yml | 3 ++-
.../scigap/production/host_vars/microbial-genomes/vars.yml | 3 ++-
.../inventories/scigap/production/host_vars/regsnps/vars.yml | 3 ++-
.../inventories/scigap/production/host_vars/simccs/vars.yml | 7 ++++---
.../inventories/scigap/production/host_vars/testdrive/vars.yml | 3 ++-
8 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/dev-tools/ansible/inventories/scigap/production/host_vars/ampgateway/vars.yml b/dev-tools/ansible/inventories/scigap/production/host_vars/ampgateway/vars.yml
index c555ac8f92..049db755b5 100644
--- a/dev-tools/ansible/inventories/scigap/production/host_vars/ampgateway/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/host_vars/ampgateway/vars.yml
@@ -20,8 +20,8 @@
---
airavata_django_extra_dependencies:
- - git+https://github.com/SciGaP/amp-gateway-django-app.git#egg=amp_gateway_django_app
- - "git+ssh://git@github.com/SciGaP/trecx-django-app.git#egg=trecx-django-app"
+ - name: "git+ssh://git@github.com/SciGaP/trecx-django-app.git#egg=trecx-django-app"
+ editable: true
vhost_servername: "amosgateway.org"
diff --git a/dev-tools/ansible/inventories/scigap/production/host_vars/geo/vars.yml b/dev-tools/ansible/inventories/scigap/production/host_vars/geo/vars.yml
index 9bf0a1a8fb..97aac8b818 100644
--- a/dev-tools/ansible/inventories/scigap/production/host_vars/geo/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/host_vars/geo/vars.yml
@@ -23,7 +23,8 @@
#gateway_data_store_hostname: "js-168-166.jetstream-cloud.org"
airavata_django_extra_dependencies:
- - "git+https://github.com/GeoGateway/geogateway-django-app.git@master#egg=geogateway_django_app"
+ - name: "git+https://github.com/GeoGateway/geogateway-django-app.git@master#egg=geogateway_django_app"
+ editable: true
vhost_servername: "geo-gateway.org"
diff --git a/dev-tools/ansible/inventories/scigap/production/host_vars/immune/vars.yml b/dev-tools/ansible/inventories/scigap/production/host_vars/immune/vars.yml
index d892f8a0ca..d9c4e4a0e8 100644
--- a/dev-tools/ansible/inventories/scigap/production/host_vars/immune/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/host_vars/immune/vars.yml
@@ -22,7 +22,8 @@
#gateway_data_store_resource_id: "js-168-166.jetstream-cloud.org_e86fd426-201a-461a-a0b4-4368af59ca28"
#gateway_data_store_hostname: "js-168-166.jetstream-cloud.org"
airavata_django_extra_dependencies:
- - git+https://github.com/SciGaP/immuneportal-django-app.git#egg=immuneportal_django_app
+ - name: git+https://github.com/SciGaP/immuneportal-django-app.git#egg=immuneportal_django_app
+ editable: true
vhost_servername: "immuneportal.ccbb.iupui.edu"
diff --git a/dev-tools/ansible/inventories/scigap/production/host_vars/lrose/vars.yml b/dev-tools/ansible/inventories/scigap/production/host_vars/lrose/vars.yml
index 930067e8da..c0149f27e7 100644
--- a/dev-tools/ansible/inventories/scigap/production/host_vars/lrose/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/host_vars/lrose/vars.yml
@@ -23,7 +23,8 @@
#gateway_data_store_hostname: "js-168-166.jetstream-cloud.org"
airavata_django_extra_dependencies:
- - git+https://github.com/NCAR/lrose-sgci.git@production#egg=my-custom-django-app
+ - name: git+https://github.com/NCAR/lrose-sgci.git@production#egg=my-custom-django-app
+ editable: true
vhost_servername: "gateway.lrose.net"
vhost_ssl: True
diff --git a/dev-tools/ansible/inventories/scigap/production/host_vars/microbial-genomes/vars.yml b/dev-tools/ansible/inventories/scigap/production/host_vars/microbial-genomes/vars.yml
index 7ee86dc363..7b87d78f95 100644
--- a/dev-tools/ansible/inventories/scigap/production/host_vars/microbial-genomes/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/host_vars/microbial-genomes/vars.yml
@@ -21,7 +21,8 @@
---
airavata_django_extra_dependencies:
- - "git+https://github.com/bio-miga/miga-autocomplete.git#egg=miga_djangoapp"
+ - name: "git+https://github.com/bio-miga/miga-autocomplete.git#egg=miga_djangoapp"
+ editable: true
#vhost_servername: "clades.microbial-genomes.org" #Changed on Miguel's request on 06/25/2020
vhost_servername: "xsede.microbial-genomes.org"
diff --git a/dev-tools/ansible/inventories/scigap/production/host_vars/regsnps/vars.yml b/dev-tools/ansible/inventories/scigap/production/host_vars/regsnps/vars.yml
index 5ce8bfc369..8b4c13954d 100644
--- a/dev-tools/ansible/inventories/scigap/production/host_vars/regsnps/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/host_vars/regsnps/vars.yml
@@ -23,7 +23,8 @@
#gateway_data_store_hostname: "js-168-166.jetstream-cloud.org"
airavata_django_extra_dependencies:
- - git+https://github.com/SciGaP/regsnp-django-app.git#egg=regsnp_django_app
+ - name: git+https://github.com/SciGaP/regsnp-django-app.git#egg=regsnp_django_app
+ editable: true
vhost_servername: "regsnps.ccbb.iupui.edu"
vhost_ssl: True
diff --git a/dev-tools/ansible/inventories/scigap/production/host_vars/simccs/vars.yml b/dev-tools/ansible/inventories/scigap/production/host_vars/simccs/vars.yml
index fa3746c1a4..86354c8215 100644
--- a/dev-tools/ansible/inventories/scigap/production/host_vars/simccs/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/host_vars/simccs/vars.yml
@@ -31,9 +31,10 @@ airavata_django_extra_dependencies:
# just cython, then a second with the other dependencies. Reason: pyjnius
# requires that cython already be installed and they can't both be installed
# at the same time.
- - cython
- - "git+https://github.com/SciGaP/simccs-maptool.git@{{ simccs_maptool_branch }}#egg=simccs-maptool"
- - pyjnius
+ - name: cython
+ - name: "git+https://github.com/SciGaP/simccs-maptool.git@{{ simccs_maptool_branch }}#egg=simccs-maptool"
+ editable: true
+ - name: pyjnius
django_extra_settings:
JAVA_HOME: "/usr/java/default"
diff --git a/dev-tools/ansible/inventories/scigap/production/host_vars/testdrive/vars.yml b/dev-tools/ansible/inventories/scigap/production/host_vars/testdrive/vars.yml
index 0564f09623..ba2a2aab1a 100644
--- a/dev-tools/ansible/inventories/scigap/production/host_vars/testdrive/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/host_vars/testdrive/vars.yml
@@ -20,7 +20,8 @@
---
airavata_django_extra_dependencies:
- - git+https://github.com/machristie/custom_ui_tutorial_app_solution.git@main#egg=custom_ui_tutorial_app
+ - name: git+https://github.com/machristie/custom_ui_tutorial_app_solution.git@main#egg=custom_ui_tutorial_app
+ editable: true
airavata_django_git_branch: "staging"
vhost_servername: "testdrive.airavata.org"
vhost_ssl: True
[airavata] 02/03: Merge branch 'develop'
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata.git
commit 2a66a2a1c803f2047261f1359b35a559e346f656
Merge: 562fd93dec caff5027a9
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Fri Jul 29 14:10:18 2022 -0400
Merge branch 'develop'
.../airavata/api/Airavata-remote | 22 +-
.../airavata-python-sdk/airavata/api/Airavata.py | 1778 ++++++++++++++------
.../model/appcatalog/computeresource/ttypes.py | 3 +
.../airavata/model/messaging/event/ttypes.py | 101 ++
.../airavata/model/workspace/ttypes.py | 90 +
.../airavata_sdk/clients/keycloak_token_fetcher.py | 9 +-
.../samples/create_launch_echo_experiment.py | 2 +-
.../samples/resources/incommon_rsa_server_ca.pem | 152 +-
.../airavata-python-sdk/requirements.txt | 3 +-
.../airavata-python-sdk/setup.py | 2 +-
.../scigap/develop-js2/files/airavata.jks | 76 +
.../scigap/develop-js2/files/airavata_sym.jks | 30 +
.../scigap/develop-js2/files/client_truststore.jks | Bin 0 -> 6618 bytes
.../scigap/develop-js2/files/keycloak.jks | 143 ++
.../group_vars/all/vars.yml | 8 +-
.../scigap/develop-js2/group_vars/all/vault.yml | 37 +
.../scigap/develop-js2/group_vars/django/vars.yml | 54 +
.../scigap/develop-js2/group_vars/django/vault.yml | 10 +
.../host_vars/amp/vars.yml | 39 +-
.../scigap/develop-js2/host_vars/amp/vault.yml | 12 +
.../scigap/develop-js2/host_vars/csbglsu/vars.yml | 47 +
.../scigap/develop-js2/host_vars/csbglsu/vault.yml | 12 +
.../host_vars/custos-testdrive}/vars.yml | 45 +-
.../host_vars/custos-testdrive/vault.yml | 12 +
.../host_vars/cyberwater}/vars.yml | 36 +-
.../develop-js2/host_vars/cyberwater/vault.yml | 12 +
.../geo => develop-js2/host_vars/delta}/vars.yml | 50 +-
.../scigap/develop-js2/host_vars/delta/vault.yml | 12 +
.../host_vars/geo/vars.yml | 25 +-
.../scigap/develop-js2/host_vars/geo/vault.yml | 12 +
.../develop-js2/host_vars/interactwel/vars.yml | 55 +
.../develop-js2/host_vars/interactwel/vault.yml | 12 +
.../scigap/develop-js2/host_vars/mines/vars.yml | 48 +
.../scigap/develop-js2/host_vars/mines/vault.yml | 12 +
.../geo => develop-js2/host_vars/nexttdb}/vars.yml | 38 +-
.../scigap/develop-js2/host_vars/nexttdb/vault.yml | 12 +
.../host_vars/pfec-hydro}/vars.yml | 38 +-
.../develop-js2/host_vars/pfec-hydro/vault.yml | 12 +
.../scigap/develop-js2/host_vars/rnamake/vars.yml | 46 +
.../scigap/develop-js2/host_vars/rnamake/vault.yml | 12 +
.../geo => develop-js2/host_vars/saver-x}/vars.yml | 38 +-
.../scigap/develop-js2/host_vars/saver-x/vault.yml | 12 +
.../scigap/develop-js2/host_vars/seagrid/vars.yml | 49 +
.../scigap/develop-js2/host_vars/seagrid/vault.yml | 12 +
.../simccs/files/django-ssl-vhost.conf.j2 | 94 ++
.../scigap/develop-js2/host_vars/simccs/vars.yml | 71 +
.../scigap/develop-js2/host_vars/simccs/vault.yml | 12 +
.../develop-js2/host_vars/simvascular/vars.yml} | 40 +-
.../develop-js2/host_vars/simvascular/vault.yml | 12 +
.../scigap/develop-js2/host_vars/usd/vars.yml | 48 +
.../scigap/develop-js2/host_vars/usd/vault.yml | 12 +
.../ansible/inventories/scigap/develop-js2/hosts | 40 +
.../scigap/develop-js2/pga_config/scigap/vars.yml | 57 +
.../scigap/develop-js2/pga_config/scigap/vault.yml | 18 +
.../scigap/develop/group_vars/all/vars.yml | 3 +
.../scigap/develop/host_vars/amp/vars.yml | 6 +-
.../scigap/develop/host_vars/geo/vars.yml | 5 +-
.../scigap/production/group_vars/all/vars.yml | 3 +
dev-tools/ansible/keycloak.yml | 1 -
dev-tools/ansible/requirements.txt | 20 +-
dev-tools/ansible/roles/api-orch/tasks/main.yml | 19 +-
dev-tools/ansible/roles/common/tasks/main.yml | 10 +-
.../ansible/roles/database/tasks/keycloak.yml | 5 +-
dev-tools/ansible/roles/database/tasks/main.yml | 54 +-
dev-tools/ansible/roles/database/vars/main.yml | 3 +-
dev-tools/ansible/roles/django/tasks/database.yml | 16 +-
.../tasks/install_deps_Centos_7.yml} | 6 +-
.../tasks/install_deps_Rocky_8.yml} | 12 +-
dev-tools/ansible/roles/django/tasks/main.yml | 29 +-
.../roles/django/templates/settings_local.py.j2 | 13 +
.../django_setup/tasks/install_deps_Rocky_8.yml | 108 ++
.../ansible/roles/django_setup/tasks/main.yml | 2 +-
.../roles/env_setup/tasks/files/dnf-cron.conf | 85 +
dev-tools/ansible/roles/env_setup/tasks/main.yml | 26 +-
.../ansible/roles/helix_setup/defaults/main.yml | 2 +
.../participant/airavata-server.properties.j2 | 1 +
.../tasks/install_deps_Rocky_8.yml} | 17 +-
dev-tools/ansible/roles/httpd/tasks/main.yml | 7 +-
dev-tools/ansible/roles/java/tasks/main.yml | 11 +-
dev-tools/ansible/roles/java/vars/main.yml | 3 +
dev-tools/ansible/roles/keycloak/defaults/main.yml | 1 +
dev-tools/ansible/roles/keycloak/tasks/main.yml | 83 +-
.../templates/keycloak.service.j2} | 16 +-
.../tasks/install_deps_CentOS_7.yml} | 13 +-
.../tasks/install_deps_Rocky_8.yml} | 13 +-
dev-tools/ansible/roles/letsencrypt/tasks/main.yml | 15 +-
dev-tools/ansible/roles/rabbitmq/tasks/main.yml | 16 +-
.../helix/impl/task/staging/DataStagingTask.java | 17 +-
.../impl/task/staging/OutputDataStagingTask.java | 11 +-
.../main/assembly/email-monitor-bin-assembly.xml | 3 +-
modules/ide-integration/README.md | 6 +-
.../src/main/resources/email-config.yaml | 2 +-
modules/job-monitor/email-monitor/pom.xml | 6 +-
.../src/main/resources/email-config.yaml | 2 +-
modules/job-monitor/pom.xml | 9 +-
95 files changed, 3355 insertions(+), 959 deletions(-)