merging upstream
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/e48a02ea Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/e48a02ea Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/e48a02ea Branch: refs/heads/master Commit: e48a02eaf8e81f209ae7291c3e01d30fd445e5b1 Parents: be5ef40 b6312d9 Author: scnakandala <[email protected]> Authored: Thu Apr 27 14:52:38 2017 -0400 Committer: scnakandala <[email protected]> Committed: Thu Apr 27 14:52:38 2017 -0400 ---------------------------------------------------------------------- dev-tools/ansible/ansible.cfg | 2 +- .../cornell-dnasequence/pga-ssl-vhost.conf.j2 | 31 ++++++++++ .../pga_config/cornell-dnasequence/vars.yml | 63 +++++++++++++++++++ .../pga_config/cornell-dnasequence/vault.yml | 18 ++++++ .../production/pga_config/simvascular/vars.yml | 10 ++- .../production/pga_config/ultrascan/vars.yml | 64 ++++++++++++++++++++ .../production/pga_config/ultrascan/vault.yml | 18 ++++++ .../scigap/production/pga_config/utah/vars.yml | 4 +- dev-tools/ansible/pga-scigap-prod.yml | 2 + .../roles/gfac/templates/gfac-config.yaml.j2 | 1 + dev-tools/ansible/roles/pga/defaults/main.yml | 4 ++ dev-tools/ansible/roles/pga/tasks/main.yml | 10 +-- .../roles/pga/templates/pga_config.php.j2 | 2 +- 13 files changed, 217 insertions(+), 12 deletions(-) ----------------------------------------------------------------------
