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/04/26 18:54:50 UTC
airavata git commit: Disabling data sharing for Ultrascan PGA
Repository: airavata
Updated Branches:
refs/heads/master c99687f99 -> 6791f289e
Disabling data sharing for Ultrascan PGA
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/6791f289
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/6791f289
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/6791f289
Branch: refs/heads/master
Commit: 6791f289e0c02956bcfc41913da332b570a7d673
Parents: c99687f
Author: Marcus Christie <ma...@apache.org>
Authored: Wed Apr 26 14:53:26 2017 -0400
Committer: Marcus Christie <ma...@apache.org>
Committed: Wed Apr 26 14:53:26 2017 -0400
----------------------------------------------------------------------
.../inventories/scigap/production/pga_config/ultrascan/vars.yml | 2 ++
dev-tools/ansible/pga-scigap-prod.yml | 1 +
dev-tools/ansible/roles/pga/defaults/main.yml | 1 +
dev-tools/ansible/roles/pga/templates/pga_config.php.j2 | 2 +-
4 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/6791f289/dev-tools/ansible/inventories/scigap/production/pga_config/ultrascan/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/ultrascan/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/ultrascan/vars.yml
index 2548cb8..491b491 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/ultrascan/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/ultrascan/vars.yml
@@ -52,6 +52,8 @@ gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62
# Not using gateway storage right now
#gateway_data_store_ssh_public_key: ""
+data_sharing_enabled: "false"
+
## Portal related variables
super_admin_portal: "true"
admin_emails: "['eroma.abeysinghe@gmail.com','sgg@iu.edu']"
http://git-wip-us.apache.org/repos/asf/airavata/blob/6791f289/dev-tools/ansible/pga-scigap-prod.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/pga-scigap-prod.yml b/dev-tools/ansible/pga-scigap-prod.yml
index 6ab9c9d..6a0ed62 100644
--- a/dev-tools/ansible/pga-scigap-prod.yml
+++ b/dev-tools/ansible/pga-scigap-prod.yml
@@ -35,6 +35,7 @@
- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/southdakota"
- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/southernillinois"
- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/testdrive"
+- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/ultrascan"
- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/utah"
...
http://git-wip-us.apache.org/repos/asf/airavata/blob/6791f289/dev-tools/ansible/roles/pga/defaults/main.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/pga/defaults/main.yml b/dev-tools/ansible/roles/pga/defaults/main.yml
index 4b66323..a36593c 100644
--- a/dev-tools/ansible/roles/pga/defaults/main.yml
+++ b/dev-tools/ansible/roles/pga/defaults/main.yml
@@ -56,6 +56,7 @@ gateway_id: "{{ default_gateway }}"
experiment_data_dir: "{{ user_data_dir }}"
gateway_data_store_resource_id: "js-170-103.jetstream-cloud.org_6497a464-3121-4b64-a7cb-d195b0a26c19"
gateway_data_store_ssh_public_key: ""
+data_sharing_enabled: "true"
## Portal related variables
super_admin_portal: "true"
http://git-wip-us.apache.org/repos/asf/airavata/blob/6791f289/dev-tools/ansible/roles/pga/templates/pga_config.php.j2
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/pga/templates/pga_config.php.j2 b/dev-tools/ansible/roles/pga/templates/pga_config.php.j2
index 78cb65b..a8b34da 100644
--- a/dev-tools/ansible/roles/pga/templates/pga_config.php.j2
+++ b/dev-tools/ansible/roles/pga/templates/pga_config.php.j2
@@ -169,7 +169,7 @@ return array(
/**
* Data Sharing enabled
*/
- 'data-sharing-enabled' => true
+ 'data-sharing-enabled' => {{ data_sharing_enabled }}
],
/**