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/10/02 16:13:55 UTC
[airavata] branch staging updated (eb39d24 -> 73f34cb)
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a change to branch staging
in repository https://gitbox.apache.org/repos/asf/airavata.git.
from eb39d24 django_extra_settiings converts yaml data to arbitrary json
new 88ebfc3 Ansible: setting staging simccs data store key
new 73f34cb Fix installing data store ssh key for Django deploys
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../ansible/inventories/scigap/staging/host_vars/simccs/vars.yml | 2 +-
dev-tools/ansible/roles/django/tasks/main.yml | 7 +++++++
dev-tools/ansible/roles/httpd/tasks/main.yml | 7 -------
3 files changed, 8 insertions(+), 8 deletions(-)
[airavata] 02/02: Fix installing data store ssh key for Django
deploys
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch staging
in repository https://gitbox.apache.org/repos/asf/airavata.git
commit 73f34cb8d8eb4e93a94f443db081d9d647bac04c
Author: Marcus Christie <ma...@iu.edu>
AuthorDate: Wed Oct 2 11:05:58 2019 -0400
Fix installing data store ssh key for Django deploys
---
dev-tools/ansible/roles/django/tasks/main.yml | 7 +++++++
dev-tools/ansible/roles/httpd/tasks/main.yml | 7 -------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/dev-tools/ansible/roles/django/tasks/main.yml b/dev-tools/ansible/roles/django/tasks/main.yml
index 3a6b86f..0cd19b0 100644
--- a/dev-tools/ansible/roles/django/tasks/main.yml
+++ b/dev-tools/ansible/roles/django/tasks/main.yml
@@ -157,3 +157,10 @@
notify:
- restart httpd
when: vhost_ssl
+
+- name: copy user's SSH key for the gateway data store
+ authorized_key:
+ user: "{{user}}"
+ key: "{{ gateway_data_store_ssh_public_key }}"
+ become: yes
+ when: gateway_data_store_ssh_public_key != ""
diff --git a/dev-tools/ansible/roles/httpd/tasks/main.yml b/dev-tools/ansible/roles/httpd/tasks/main.yml
index 469c105..85bc93a 100644
--- a/dev-tools/ansible/roles/httpd/tasks/main.yml
+++ b/dev-tools/ansible/roles/httpd/tasks/main.yml
@@ -55,13 +55,6 @@
become: yes
when: ansible_os_family == "RedHat"
-- name: copy pga user's SSH key for the gateway data store
- authorized_key:
- user: "{{user}}"
- key: "{{ gateway_data_store_ssh_public_key }}"
- become: yes
- when: gateway_data_store_ssh_public_key != ""
-
# Firewall settings
- name: Enable https and http service on public zone
firewalld: service="{{ item }}" permanent=true state=enabled zone=public immediate=True
[airavata] 01/02: Ansible: setting staging simccs data store key
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch staging
in repository https://gitbox.apache.org/repos/asf/airavata.git
commit 88ebfc3f50caad50d0ef059b26b1e3b718d5c770
Author: Marcus Christie <ma...@iu.edu>
AuthorDate: Wed Oct 2 10:50:59 2019 -0400
Ansible: setting staging simccs data store key
---
dev-tools/ansible/inventories/scigap/staging/host_vars/simccs/vars.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-tools/ansible/inventories/scigap/staging/host_vars/simccs/vars.yml b/dev-tools/ansible/inventories/scigap/staging/host_vars/simccs/vars.yml
index bbce661..a9e3ae8 100644
--- a/dev-tools/ansible/inventories/scigap/staging/host_vars/simccs/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/staging/host_vars/simccs/vars.yml
@@ -54,7 +54,7 @@ auth_options:
gateway_id: "iu-geology-survey"
experiment_data_dir: "{{ user_data_dir }}/iu-geology-survey"
-#gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCBqS31Ucj6HB2QaLI0+XORTnvxRPDI6niuZjBAq0nQ3D7HoPohLVNVsqA7a9hksGL9w79PVyugmzGwIPbmnOLHwccO1Pmu5Yc4vg91gH9MMlNy9ZzhmzFwEfir8oefb0MjjPFTBdskL8jMmwebO0hwSWxv96R5Ir/kx/+vGo//XhDh5/4e1DLMJDpVc1A2w+HeNoRQNlgQFqWKZDFRzWVaciRbilueW7Yjxxd9oe2/XLDT7MMs3HBPXsfwMWW5QY3oCUy3AVsxnJWsvSPHpD7dbAB2guHal0j0xrudUwZa8ZLN9He89/EBU6XSQs3Uhb9QBUweosEa7TAIPP5GpRC1"
+gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDEuA1indjdczBXg2qrmD0bB0QfKq0u2q3o25DegTaty5LoogW+APEvXmwc2g6PzkM75MgfMsTErMQaQ3/PoElADQKg2/NePz05YWobn9zrPZFeRWfOqWMjFDx72cffHKBzgnahFDBlR/YJhf4IZJ+EOA1zMiMF2oZQmEYQtbQFhbKPF+jrScEQeuXVuXWSS2sKNAVKj3pY4kmi9kEOYELee/O6ghBUfrVhB95vDKJPgmQSuo3pgkLRdflTBSAQ54UchwjXi2RA9Xv0RXJF/JyyRGn6bSbRxYhsm5RJeiBVj4ua7p2b36rSYVqtVsTKEonx5kYdKzwyjJXWpjB2KtQp"
django_hidden_airavata_apps: "[]"
admin_emails: "[('SGRC', 'sgrc-iu-group@iu.edu'), ('Kevin Ellett', 'kmellett@indiana.edu'),('Ryan Kammer', 'rkammer@indiana.edu'), ('Eroma Abeysinghe', 'eabeysin@iu.edu')]"