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 <[email protected]> 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(-)
