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/03/08 15:15:39 UTC
[27/27] airavata git commit: Merge branch 'pga_update' of
https://github.com/ECoulter/airavata into develop
Merge branch 'pga_update' of https://github.com/ECoulter/airavata into develop
This closes #100
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/2071c7c2
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/2071c7c2
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/2071c7c2
Branch: refs/heads/develop
Commit: 2071c7c25cdf16e3a28540b8c2edd859f3a21596
Parents: 7da786f d7764ad
Author: Marcus Christie <ma...@apache.org>
Authored: Wed Mar 8 10:13:43 2017 -0500
Committer: Marcus Christie <ma...@apache.org>
Committed: Wed Mar 8 10:13:43 2017 -0500
----------------------------------------------------------------------
dev-tools/ansible/README.md | 1 +
dev-tools/ansible/group_vars/all.yml | 5 +-
.../ansible/roles/env_setup/tasks/main.yml | 10 +-
dev-tools/ansible/roles/pga/handlers/main.yml | 4 +-
.../roles/pga/tasks/install_deps_CentOS_7.yml | 33 +++
.../roles/pga/tasks/install_deps_Ubuntu_14.yml | 48 ++++
.../roles/pga/tasks/install_deps_Ubuntu_16.yml | 61 +++++
dev-tools/ansible/roles/pga/tasks/main.yml | 86 ++-----
.../ansible/roles/pga/templates/apache2.conf.j2 | 222 +++++++++++++++++++
dev-tools/ansible/roles/pga/vars/main.yml | 7 +-
10 files changed, 409 insertions(+), 68 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/2071c7c2/dev-tools/ansible/group_vars/all.yml
----------------------------------------------------------------------
diff --cc dev-tools/ansible/group_vars/all.yml
index 534ac6a,8a6e545..534db86
--- a/dev-tools/ansible/group_vars/all.yml
+++ b/dev-tools/ansible/group_vars/all.yml
@@@ -1,8 -1,8 +1,8 @@@
---
ansible_connection: ssh
-# ansible_ssh_user: centos
-ansible_ssh_user: root
+# ansible_user: centos
+ansible_user: root
- ansible_ssh_private_key_file: /Users/supun/Desktop/shameera-key.pem
+ #ansible_ssh_private_key_file: /Users/supun/Desktop/shameera-key.pem
# ansible_ssh_private_key_file: /Users/syodage/Projects/airavata-ansible/shameera-aws.pem.txt
user: centos