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 2017/08/28 19:29:20 UTC

[20/20] airavata git commit: Merge branch 'master' into develop

Merge branch 'master' into develop


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/f2e5f0d3
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/f2e5f0d3
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/f2e5f0d3

Branch: refs/heads/develop
Commit: f2e5f0d3a20a7edc74519fa0f7feadf894f2a21c
Parents: 34e1c0e ce376aa
Author: Marcus Christie <ma...@iu.edu>
Authored: Mon Aug 28 15:28:36 2017 -0400
Committer: Marcus Christie <ma...@iu.edu>
Committed: Mon Aug 28 15:28:36 2017 -0400

----------------------------------------------------------------------
 dev-tools/ansible/README.md                     |  14 +-
 .../inventories/airavata-iam/group_vars/all.yml |  16 --
 .../ansible/inventories/airavata-iam/hosts      |   8 -
 .../inventories/develop/group_vars/.gitignore   |   1 -
 .../inventories/develop/group_vars/all.yml      | 123 ---------
 .../develop/group_vars/dev-airavata.yml         |  22 --
 .../inventories/develop/group_vars/dev-pga.yml  |  23 --
 .../develop/group_vars/local.yml.template       |   4 -
 dev-tools/ansible/inventories/develop/hosts     |  35 ---
 .../PICKSC-Production/group_vars/pga/vars.yml   |   2 +-
 .../dreg-production/group_vars/pga/vars.yml     |  14 +-
 .../dreg-production/group_vars/pga/vault.yml    |  34 +--
 .../production/pga_config/NCSAIndustry/vars.yml |  65 +++++
 .../pga_config/NCSAIndustry/vault.yml           |  18 ++
 .../production/pga_config/csbglsu/vars.yml      |  61 +++++
 .../production/pga_config/csbglsu/vault.yml     |  18 ++
 .../production/pga_config/iugeosurvey/vars.yml  |  61 +++++
 .../production/pga_config/iugeosurvey/vault.yml |  18 ++
 .../production/pga_config/simvascular/vars.yml  |   4 +
 .../scigap/production/pga_config/uab/vars.yml   |   6 +-
 .../scigap/production/pga_config/wvsu/vars.yml  |  71 +++++
 .../scigap/production/pga_config/wvsu/vault.yml |  18 ++
 .../template/group_vars/all/vars.yml            | 141 ++++++++++
 .../template/group_vars/pga/vars.yml            |  70 +++++
 dev-tools/ansible/inventories/template/hosts    |  24 ++
 .../testing-0.17-scigap/group_vars/all/vars.yml | 116 --------
 .../group_vars/all/vault.yml                    |   7 -
 .../testing-0.17-scigap/group_vars/pga/vars.yml |  56 ----
 .../group_vars/pga/vault.yml                    |  18 --
 .../inventories/testing-0.17-scigap/hosts       |  23 --
 .../group_vars/all/vars.yml                     | 111 --------
 .../group_vars/all/vault.yml                    |   7 -
 .../group_vars/pga/vars.yml                     |  51 ----
 .../group_vars/pga/vault.yml                    |  18 --
 .../inventories/testing-0.17-testdrive/hosts    |  23 --
 .../inventories/testing-0.17/files/airavata.jks |  76 ------
 .../testing-0.17/files/airavata_sym.jks         |  30 --
 .../testing-0.17/files/client_truststore.jks    | 271 -------------------
 .../testing-0.17/group_vars/all/vars.yml        | 115 --------
 .../testing-0.17/group_vars/all/vault.yml       |  13 -
 .../testing-0.17/group_vars/pga/vars.yml        |  55 ----
 .../testing-0.17/group_vars/pga/vault.yml       |  18 --
 .../ansible/inventories/testing-0.17/hosts      |  23 --
 dev-tools/ansible/pga-scigap-prod.yml           |   5 +-
 dev-tools/ansible/site.yml                      |  77 +-----
 45 files changed, 616 insertions(+), 1368 deletions(-)
----------------------------------------------------------------------