You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by er...@apache.org on 2019/06/13 20:43:52 UTC
[airavata] 02/03: Merge branch 'master' of
https://github.com/apache/airavata
This is an automated email from the ASF dual-hosted git repository.
eroma pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata.git
commit ae6a4e2c2432a20f8c83a148c8d8e6486dbd8af2
Merge: 57a3c60 cc35ce9
Author: Eroma Abeysinghe <er...@gmail.com>
AuthorDate: Thu Jun 13 16:42:38 2019 -0400
Merge branch 'master' of https://github.com/apache/airavata
.../scigap/production/files/pga_config_0.17.php.j2 | 256 ------------------
.../scigap/production/group_vars/all/vars.yml | 53 +++-
.../scigap/production/group_vars/all/vault.yml | 65 ++---
.../ansible/inventories/scigap/production/hosts | 21 +-
.../scigap/production/pga_config/Kentucky/vars.yml | 1 -
.../production/pga_config/NCSAIndustry/vars.yml | 1 -
.../scigap/production/pga_config/accord/vars.yml | 66 -----
.../scigap/production/pga_config/accord/vault.yml | 18 --
.../production/pga_config/ampgateway/vars.yml | 1 -
.../scigap/production/pga_config/brandeis/vars.yml | 57 ----
.../production/pga_config/brandeis/vault.yml | 18 --
.../scigap/production/pga_config/csbglsu/vars.yml | 1 -
.../scigap/production/pga_config/ddstudio/vars.yml | 1 -
.../scigap/production/pga_config/demo1/vars.yml | 65 -----
.../scigap/production/pga_config/demo1/vault.yml | 17 --
.../scigap/production/pga_config/demo10/vars.yml | 65 -----
.../scigap/production/pga_config/demo10/vault.yml | 17 --
.../scigap/production/pga_config/demo2/vars.yml | 65 -----
.../scigap/production/pga_config/demo2/vault.yml | 17 --
.../scigap/production/pga_config/demo3/vars.yml | 65 -----
.../scigap/production/pga_config/demo3/vault.yml | 17 --
.../scigap/production/pga_config/demo4/vars.yml | 65 -----
.../scigap/production/pga_config/demo4/vault.yml | 17 --
.../scigap/production/pga_config/demo5/vars.yml | 65 -----
.../scigap/production/pga_config/demo5/vault.yml | 17 --
.../scigap/production/pga_config/demo6/vars.yml | 65 -----
.../scigap/production/pga_config/demo6/vault.yml | 17 --
.../scigap/production/pga_config/demo7/vars.yml | 65 -----
.../scigap/production/pga_config/demo7/vault.yml | 17 --
.../scigap/production/pga_config/demo8/vars.yml | 65 -----
.../scigap/production/pga_config/demo8/vault.yml | 17 --
.../scigap/production/pga_config/demo9/vars.yml | 65 -----
.../scigap/production/pga_config/demo9/vault.yml | 17 --
.../production/pga_config/distantreader/vars.yml | 3 +-
.../production/pga_config/epwgateway/vars.yml | 12 +-
.../scigap/production/pga_config/gatech/vars.yml | 9 +-
.../production/pga_config/georgiastate/vars.yml | 1 -
.../scigap/production/pga_config/hubzero/vars.yml | 1 -
.../production/pga_config/interactwel/vars.yml | 11 +-
.../production/pga_config/iugateway/vars.yml | 1 -
.../production/pga_config/iugeosurvey/vars.yml | 1 -
.../scigap/production/pga_config/lsu/vars.yml | 1 -
.../scigap/production/pga_config/mines/vars.yml | 1 -
.../production/pga_config/nanoconfinement/vars.yml | 1 -
.../production/pga_config/nanoshape/vars.yml | 1 -
.../production/pga_config/newmexicostate/vars.yml | 1 -
.../scigap/production/pga_config/nexttdb/vars.yml | 1 -
.../scigap/production/pga_config/nsg/vars.yml | 63 -----
.../scigap/production/pga_config/nsg/vault.yml | 18 --
.../scigap/production/pga_config/oiitandy/vars.yml | 65 -----
.../production/pga_config/oiitandy/vault.yml | 18 --
.../scigap/production/pga_config/oscer/vars.yml | 1 -
.../production/pga_config/pfec-hydro/vars.yml | 1 -
.../scigap/production/pga_config/phasta/vars.yml | 7 +-
.../scigap/production/pga_config/r-hpc/vars.yml | 1 -
.../production/pga_config/rutgersgemr/vars.yml | 1 -
.../scigap/production/pga_config/saverx/vars.yml | 1 -
.../scigap/production/pga_config/scigap/vars.yml | 1 -
.../scigap/production/pga_config/sdstate/vars.yml | 1 -
.../scigap/production/pga_config/seagrid/vars.yml | 1 -
.../production/pga_config/searchingSRA/vars.yml | 1 -
.../production/pga_config/simvascular/vars.yml | 1 -
.../production/pga_config/southdakota/vars.yml | 1 -
.../pga_config/southernillinois/vars.yml | 1 -
.../production/pga_config/testdrive/vars.yml | 1 -
.../scigap/production/pga_config/uab/vars.yml | 1 -
.../production/pga_config/ultrascan/vars.yml | 7 +-
.../scigap/production/pga_config/utah/vars.yml | 65 -----
.../scigap/production/pga_config/utah/vault.yml | 18 --
.../scigap/production/pga_config/wvsu/vars.yml | 1 -
.../scigap/stagingnew/files/airavata.jks | 76 ------
.../scigap/stagingnew/files/airavata_sym.jks | 30 ---
.../scigap/stagingnew/files/client_truststore.jks | 271 -------------------
.../scigap/stagingnew/files/keycloak.jks | 143 ----------
.../scigap/stagingnew/group_vars/all/vars.yml | 166 ------------
.../scigap/stagingnew/group_vars/all/vault.yml | 35 ---
.../ansible/inventories/scigap/stagingnew/hosts | 26 --
.../stagingnew/pga_config/NCSAIndustry/vars.yml | 64 -----
.../stagingnew/pga_config/NCSAIndustry/vault.yml | 18 --
.../stagingnew/pga_config/ampgateway/vars.yml | 65 -----
.../stagingnew/pga_config/ampgateway/vault.yml | 18 --
.../scigap/stagingnew/pga_config/csbglsu/vars.yml | 62 -----
.../scigap/stagingnew/pga_config/csbglsu/vault.yml | 18 --
.../scigap/stagingnew/pga_config/ddstudio/vars.yml | 65 -----
.../stagingnew/pga_config/ddstudio/vault.yml | 17 --
.../stagingnew/pga_config/distantreader/vars.yml | 66 -----
.../stagingnew/pga_config/distantreader/vault.yml | 18 --
.../stagingnew/pga_config/epwgateway/vars.yml | 64 -----
.../stagingnew/pga_config/epwgateway/vault.yml | 18 --
.../scigap/stagingnew/pga_config/gatech/vars.yml | 60 -----
.../scigap/stagingnew/pga_config/gatech/vault.yml | 18 --
.../stagingnew/pga_config/georgiastate/vars.yml | 64 -----
.../stagingnew/pga_config/georgiastate/vault.yml | 18 --
.../scigap/stagingnew/pga_config/hubzero/vars.yml | 64 -----
.../scigap/stagingnew/pga_config/hubzero/vault.yml | 18 --
.../stagingnew/pga_config/interactwel/vars.yml | 64 -----
.../stagingnew/pga_config/interactwel/vault.yml | 18 --
.../stagingnew/pga_config/iugateway/vars.yml | 65 -----
.../stagingnew/pga_config/iugateway/vault.yml | 18 --
.../stagingnew/pga_config/iugeosurvey/vars.yml | 66 -----
.../stagingnew/pga_config/iugeosurvey/vault.yml | 18 --
.../scigap/stagingnew/pga_config/kentucky/vars.yml | 64 -----
.../stagingnew/pga_config/kentucky/vault.yml | 18 --
.../scigap/stagingnew/pga_config/lsu/vars.yml | 56 ----
.../scigap/stagingnew/pga_config/lsu/vault.yml | 18 --
.../scigap/stagingnew/pga_config/mines/vars.yml | 65 -----
.../scigap/stagingnew/pga_config/mines/vault.yml | 18 --
.../stagingnew/pga_config/nanoconfinement/vars.yml | 64 -----
.../pga_config/nanoconfinement/vault.yml | 17 --
.../stagingnew/pga_config/nanoshape/vars.yml | 64 -----
.../stagingnew/pga_config/nanoshape/vault.yml | 18 --
.../stagingnew/pga_config/newmexicostate/vars.yml | 64 -----
.../stagingnew/pga_config/newmexicostate/vault.yml | 18 --
.../scigap/stagingnew/pga_config/nexttdb/vars.yml | 65 -----
.../scigap/stagingnew/pga_config/nexttdb/vault.yml | 18 --
.../scigap/stagingnew/pga_config/oscer/vars.yml | 64 -----
.../scigap/stagingnew/pga_config/oscer/vault.yml | 17 --
.../stagingnew/pga_config/pfec-hydro/vars.yml | 68 -----
.../stagingnew/pga_config/pfec-hydro/vault.yml | 18 --
.../scigap/stagingnew/pga_config/phasta/vars.yml | 64 -----
.../scigap/stagingnew/pga_config/phasta/vault.yml | 18 --
.../scigap/stagingnew/pga_config/r-hpc/vars.yml | 64 -----
.../scigap/stagingnew/pga_config/r-hpc/vault.yml | 18 --
.../stagingnew/pga_config/rutgersgemr/vars.yml | 64 -----
.../stagingnew/pga_config/rutgersgemr/vault.yml | 18 --
.../scigap/stagingnew/pga_config/saverx/vars.yml | 67 -----
.../scigap/stagingnew/pga_config/saverx/vault.yml | 18 --
.../scigap/stagingnew/pga_config/scigap/vars.yml | 71 -----
.../scigap/stagingnew/pga_config/scigap/vault.yml | 18 --
.../scigap/stagingnew/pga_config/sdstate/vars.yml | 65 -----
.../scigap/stagingnew/pga_config/sdstate/vault.yml | 18 --
.../scigap/stagingnew/pga_config/seagrid/vars.yml | 76 ------
.../scigap/stagingnew/pga_config/seagrid/vault.yml | 18 --
.../stagingnew/pga_config/searchingSRA/vars.yml | 68 -----
.../stagingnew/pga_config/searchingSRA/vault.yml | 18 --
.../pga_config/simvascular/files/pga_config.php.j2 | 295 ---------------------
.../stagingnew/pga_config/simvascular/vars.yml | 71 -----
.../stagingnew/pga_config/simvascular/vault.yml | 18 --
.../stagingnew/pga_config/southdakota/vars.yml | 65 -----
.../stagingnew/pga_config/southdakota/vault.yml | 17 --
.../pga_config/southernillinois/vars.yml | 65 -----
.../pga_config/southernillinois/vault.yml | 18 --
.../stagingnew/pga_config/testdrive/vars.yml | 66 -----
.../stagingnew/pga_config/testdrive/vault.yml | 18 --
.../scigap/stagingnew/pga_config/uab/vars.yml | 64 -----
.../scigap/stagingnew/pga_config/uab/vault.yml | 18 --
.../stagingnew/pga_config/ultrascan/vars.yml | 66 -----
.../stagingnew/pga_config/ultrascan/vault.yml | 18 --
.../scigap/stagingnew/pga_config/wvsu/vars.yml | 70 -----
.../scigap/stagingnew/pga_config/wvsu/vault.yml | 18 --
.../ansible/roles/helix_setup/defaults/main.yml | 2 +
.../participant/airavata-server.properties.j2 | 5 +-
.../airavata/helix/workflow/WorkflowOperator.java | 2 +
.../apache/airavata/common/utils/Constants.java | 2 +
.../airavata/common/utils/ServerSettings.java | 2 +-
155 files changed, 116 insertions(+), 5632 deletions(-)