Merge branch 'lsf-walltime' into develop
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/44f9493e Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/44f9493e Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/44f9493e Branch: refs/heads/master Commit: 44f9493e696b85033f1b4455be1d699e97e7abfc Parents: b1ed4ca 31a6705 Author: Marcus Christie <[email protected]> Authored: Tue May 9 12:29:57 2017 -0400 Committer: Marcus Christie <[email protected]> Committed: Tue May 9 12:30:52 2017 -0400 ---------------------------------------------------------------------- .../dreg-production/files/pga-ssl-vhost.conf.j2 | 31 +++++++++ .../dreg-production/group_vars/pga/vars.yml | 67 ++++++++++++++++++++ .../dreg-production/group_vars/pga/vault.yml | 18 ++++++ .../inventories/scigap/dreg-production/hosts | 21 ++++++ .../scigap/production/group_vars/all/vars.yml | 5 +- dev-tools/ansible/pga-scigap-prod.yml | 2 +- .../roles/gfac/templates/gfac-config.yaml.j2 | 1 + dev-tools/ansible/roles/pga/defaults/main.yml | 3 + .../roles/pga/tasks/install_deps_CentOS_7.yml | 1 + dev-tools/ansible/roles/pga/tasks/main.yml | 3 +- .../roles/pga/templates/pga_config.php.j2 | 2 +- .../apache/airavata/gfac/core/GFacUtils.java | 2 +- 12 files changed, 151 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/44f9493e/dev-tools/ansible/roles/pga/defaults/main.yml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/44f9493e/dev-tools/ansible/roles/pga/templates/pga_config.php.j2 ----------------------------------------------------------------------
