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 2018/02/19 22:09:50 UTC
[airavata] branch develop updated: Setting default pga_git_branch
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git
The following commit(s) were added to refs/heads/develop by this push:
new 3c3345d Setting default pga_git_branch
new cce75c8 Merge branch 'DImuthuUpe-ansible-standalone' into develop
3c3345d is described below
commit 3c3345d1160a7d9b1295b14daf3de1c4c213913d
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Mon Feb 19 17:09:19 2018 -0500
Setting default pga_git_branch
---
dev-tools/ansible/inventories/scigap/develop/group_vars/all/vars.yml | 1 +
dev-tools/ansible/inventories/scigap/develop/pga_config/scigap/vars.yml | 2 +-
.../ansible/inventories/scigap/develop/pga_config/seagrid/vars.yml | 2 +-
.../ansible/inventories/scigap/develop/pga_config/testdrive/vars.yml | 2 +-
.../ansible/inventories/scigap/dreg-production/group_vars/pga/vars.yml | 2 +-
dev-tools/ansible/roles/pga/defaults/main.yml | 2 ++
6 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/dev-tools/ansible/inventories/scigap/develop/group_vars/all/vars.yml b/dev-tools/ansible/inventories/scigap/develop/group_vars/all/vars.yml
index ec2d0ea..81330b3 100644
--- a/dev-tools/ansible/inventories/scigap/develop/group_vars/all/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/develop/group_vars/all/vars.yml
@@ -114,6 +114,7 @@ monitor_email_password: "{{ vault_monitor_email_password }}"
# PGA variables
pga_repo: "https://github.com/apache/airavata-php-gateway.git"
+pga_git_branch: "develop"
user_data_dir: "/var/www/portals/gateway-user-data"
real_user_data_dir: "/data/gateway-user-data"
## Airavata Client related variables
diff --git a/dev-tools/ansible/inventories/scigap/develop/pga_config/scigap/vars.yml b/dev-tools/ansible/inventories/scigap/develop/pga_config/scigap/vars.yml
index ae0c2ba..7a13327 100644
--- a/dev-tools/ansible/inventories/scigap/develop/pga_config/scigap/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/develop/pga_config/scigap/vars.yml
@@ -20,7 +20,7 @@
---
pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-git_branch: "develop"
+pga_git_branch: "develop"
user: "pga"
group: "pga"
doc_root_dir: "/var/www/portals/dev-scigap"
diff --git a/dev-tools/ansible/inventories/scigap/develop/pga_config/seagrid/vars.yml b/dev-tools/ansible/inventories/scigap/develop/pga_config/seagrid/vars.yml
index b81a2a6..6a5382c 100644
--- a/dev-tools/ansible/inventories/scigap/develop/pga_config/seagrid/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/develop/pga_config/seagrid/vars.yml
@@ -20,7 +20,7 @@
---
pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-git_branch: "develop"
+pga_git_branch: "develop"
user: "pga"
group: "pga"
doc_root_dir: "/var/www/portals/dev-seagrid"
diff --git a/dev-tools/ansible/inventories/scigap/develop/pga_config/testdrive/vars.yml b/dev-tools/ansible/inventories/scigap/develop/pga_config/testdrive/vars.yml
index 66e2ee7..1cf119a 100644
--- a/dev-tools/ansible/inventories/scigap/develop/pga_config/testdrive/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/develop/pga_config/testdrive/vars.yml
@@ -20,7 +20,7 @@
---
pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-git_branch: "develop"
+pga_git_branch: "develop"
user: "pga"
group: "pga"
doc_root_dir: "/var/www/portals/dev-testdrive"
diff --git a/dev-tools/ansible/inventories/scigap/dreg-production/group_vars/pga/vars.yml b/dev-tools/ansible/inventories/scigap/dreg-production/group_vars/pga/vars.yml
index 06dcc72..0e16c0e 100644
--- a/dev-tools/ansible/inventories/scigap/dreg-production/group_vars/pga/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/dreg-production/group_vars/pga/vars.yml
@@ -29,7 +29,7 @@ airavata_profile_service_server: "{{ groups['api-orch'][0] }}"
oauth_service_url: "https://iam.scigap.org/auth"
pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-git_branch: "dreg-gateway"
+pga_git_branch: "dreg-gateway"
user: "pga"
group: "pga"
doc_root_dir: "/var/www/portals/{{ gateway_id }}"
diff --git a/dev-tools/ansible/roles/pga/defaults/main.yml b/dev-tools/ansible/roles/pga/defaults/main.yml
index f5c3926..bbd0b5c 100644
--- a/dev-tools/ansible/roles/pga/defaults/main.yml
+++ b/dev-tools/ansible/roles/pga/defaults/main.yml
@@ -70,6 +70,8 @@ oauth_callback_url: "http://{{ vhost_servername }}/callback-url"
## Airavata Client related variables
#airavata_server: "tls://gw77.iu.xsede.org"
+pga_repo: "https://github.com/apache/airavata-php-gateway.git"
+pga_git_branch: "master"
airavata_server: "{{ groups['api-orch'][0] }}"
airavata_port: "8930"
airavata_profile_service_server: "{{ airavata_server }}"
--
To stop receiving notification emails like this one, please contact
machristie@apache.org.