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/05 14:48:23 UTC

airavata git commit: temp data store for gf4 for testing; install pga ssh key

Repository: airavata
Updated Branches:
  refs/heads/master 2e6437a7e -> cda1172e5


temp data store for gf4 for testing; install pga ssh key


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/cda1172e
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/cda1172e
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/cda1172e

Branch: refs/heads/master
Commit: cda1172e515bdae731cbd35f2222280173d9308f
Parents: 2e6437a
Author: Marcus Christie <ma...@apache.org>
Authored: Wed Apr 5 10:46:13 2017 -0400
Committer: Marcus Christie <ma...@apache.org>
Committed: Wed Apr 5 10:46:13 2017 -0400

----------------------------------------------------------------------
 .../scigap/production/group_vars/pga-seagrid/vars.yml          | 5 +++--
 dev-tools/ansible/roles/pga/defaults/main.yml                  | 1 +
 dev-tools/ansible/roles/pga/tasks/main.yml                     | 6 ++++++
 3 files changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/cda1172e/dev-tools/ansible/inventories/scigap/production/group_vars/pga-seagrid/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/group_vars/pga-seagrid/vars.yml b/dev-tools/ansible/inventories/scigap/production/group_vars/pga-seagrid/vars.yml
index f024d1a..89f300f 100644
--- a/dev-tools/ansible/inventories/scigap/production/group_vars/pga-seagrid/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/group_vars/pga-seagrid/vars.yml
@@ -44,8 +44,9 @@ oauth_client_secret: "{{ vault_oauth_client_secret }}"
 gateway_id: "seagrid"
 # relative to document root dir
 experiment_data_dir: "{{ user_data_dir }}/seagrid"
-# TODO: fix this
-gateway_data_store_resource_id: "149.165.156.11_b5f26430-14d5-4372-8a7e-39b125aa640b"
+# TODO: this is only for testing, we'll need to update this again during the real migration
+gateway_data_store_resource_id: "gf4.ucs.indiana.edu_71a8409a-0713-4a45-985f-22847f63df4e"
+gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCApfdud3cJ7rx44M41gEKVgRfefk/Vd/7dIp9Xr9juX4jqmGuLoZR+hk287Hmbps6hZv23Av97XkCLldH0pueDekthcBDo4cRiQMDBp9NLz/9muqYVBl985psEbazYygagy/q/3ebi4CVEYVd4cHBee1V3GYyuJS2RklF0s/Otyf8x8auJSMniHGbTbVqtFlEOYuPdXlRBfH37k55N7+2iXKsIVvgn1MDweHEbQWJMx2LDCkLfJitreTiwcuST55w6N/n8WYZM2t+ie3BJEr6tcGAVIuyxj7CbMYMziM/hM5J+oQGPY/IBtiNZoxiZ0DeAC9SiEvE9fbTEW2iRWnQL"
 
 ## Portal related variables
 super_admin_portal: "false"

http://git-wip-us.apache.org/repos/asf/airavata/blob/cda1172e/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 07f9a28..eb0308d 100644
--- a/dev-tools/ansible/roles/pga/defaults/main.yml
+++ b/dev-tools/ansible/roles/pga/defaults/main.yml
@@ -48,6 +48,7 @@ gateway_id: "{{ default_gateway }}"
 # relative to document root dir
 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: ""
 
 ## Portal related variables
 super_admin_portal: "true"

http://git-wip-us.apache.org/repos/asf/airavata/blob/cda1172e/dev-tools/ansible/roles/pga/tasks/main.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/pga/tasks/main.yml b/dev-tools/ansible/roles/pga/tasks/main.yml
index 3f4aba6..4ded1f4 100644
--- a/dev-tools/ansible/roles/pga/tasks/main.yml
+++ b/dev-tools/ansible/roles/pga/tasks/main.yml
@@ -105,3 +105,9 @@
   notify:
     - restart httpd
   when: vhost_ssl
+
+- name: copy pga user's SSH key for the gateway data store
+  authorized_key:
+    user: "{{user}}"
+    key: "{{ gateway_data_store_ssh_public_key }}"
+  when: gateway_data_store_ssh_public_key != ""