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 2019/06/25 14:58:14 UTC
[airavata] branch develop updated: AIRAVATA-3085 Ansible setting
for pga_config group-resource-profile-id
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 dece907 AIRAVATA-3085 Ansible setting for pga_config group-resource-profile-id
dece907 is described below
commit dece907c14813c9f07b5bc913727998385349aba
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Tue Jun 25 10:58:05 2019 -0400
AIRAVATA-3085 Ansible setting for pga_config group-resource-profile-id
---
.../ansible/inventories/scigap/develop/pga_config/seagrid/vars.yml | 1 +
.../inventories/scigap/develop/pga_config/testdrive/vars.yml | 1 +
dev-tools/ansible/roles/pga/templates/pga_config.php.j2 | 7 ++++++-
3 files changed, 8 insertions(+), 1 deletion(-)
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 61c57f8..f512cf2 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
@@ -54,6 +54,7 @@ experiment_data_dir: "{{ user_data_dir }}/dev-seagrid"
# TODO: Fix the data store resource id
gateway_data_store_resource_id: "pgadev.scigap.org_7ddf28fd-d503-4ff8-bbc5-3279a7c3b99e"
gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDWgLve4J9WCohF/4UnbBZsh/nRkP1aM9FmA1FjKwK2gQAnKwhU+NrbsjW38h2Hi+8s9N2oZ9cCJHrvDi2U0cMxz4exIUBcVoRhw37ThlREHADeKR1FbKw0QLhTyfJb0K+1/8GWRluiFx0vHPptJe0KTqu+RJY0NSe+d/BEuGyCZ1hR+SKNuTgcb05Ia6opbSN5D68N9biseEux60d69ARQxLw+VN3Kr/UaBNpGIAfKLlLSUQlTyPA6G6UKCcJZv+/ye10oa0SK0qtrxMpL+4VJcVx+d56U7CUFWKEgPAaQrX1qdGUNDA7HKmD+EBtzw6DJqNJ0Cue/XuPe/RT62tpf"
+group_resource_profile_id: "6a642772-15fd-4d10-a847-8aef89b71830"
## Portal related variables
super_admin_portal: "false"
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 349656e..e1b0034 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
@@ -52,6 +52,7 @@ gateway_id: "default"
experiment_data_dir: "{{ user_data_dir }}/dev-testdrive"
gateway_data_store_resource_id: "pgadev.scigap.org_7ddf28fd-d503-4ff8-bbc5-3279a7c3b99e"
gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCEK6v8oMNUKDqQtlHlXRUpRZVqCL6CbQlJTL5QajevPFtvM0hauS/Rjj6M/bjgTfRyef2/E100l1pH3xhFuL65+OTnOZgC5DQ0T3J1OtldTTuP1Rl7mKZR4xKYzx/hxSgB6kn8tZb3IgDCYnHNcTLYGj1rEpNEO6ju8e9qVR02ex+hbC+4Q4bJgX6FxHL4+rQHcqT6I1k3JmwRsPzr3P1hiRgUUkxAlQuXFXsoa4+9BzEU5D0qXq0o/Q12jKOhPwWyOyhV2X++bc50VKkm0G6M6n78OL8CBIKmZyczgEwD2zB9gx3aTHXTEgUqaVHyOMc3aE8Kt1Us33PDyXpn8sk3"
+group_resource_profile_id: "1cee1887-6774-49c4-9f3c-edfc3558cf9b"
## Portal related variables
super_admin_portal: "false"
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 bbd9c59..9ffd844 100644
--- a/dev-tools/ansible/roles/pga/templates/pga_config.php.j2
+++ b/dev-tools/ansible/roles/pga/templates/pga_config.php.j2
@@ -193,7 +193,12 @@ return array(
/**
* Data Sharing enabled
*/
- 'data-sharing-enabled' => {{ data_sharing_enabled }}
+ 'data-sharing-enabled' => {{ data_sharing_enabled }},
+
+ /**
+ * Group Resource Profile ID to use when submitting experiments
+ */
+ 'group-resource-profile-id' => '{{ group_resource_profile_id }}',
],
/**