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 2021/08/04 20:26:23 UTC
[airavata] branch develop updated (333d7f3 -> 35bbf10)
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git.
from 333d7f3 Ansible: update the dev amp gateway storage resource id
add df4a8a7 Ansible: handle httpd alias with no custom headers
add a22db2c Ansible: remove distantreader from deploys
new 4eb4476 AIRAVATA-3420 Ansible: updates to refactored USER_STORAGES setting
new 35bbf10 Merge branch 'airavata-3420' into develop
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:
dev-tools/ansible/inventories/scigap/production/hosts | 3 ++-
.../roles/django/templates/django-ssl-vhost.conf.j2 | 2 +-
.../ansible/roles/django/templates/django-vhost.conf.j2 | 2 +-
.../ansible/roles/django/templates/settings_local.py.j2 | 14 +++++++++++---
4 files changed, 15 insertions(+), 6 deletions(-)
[airavata] 02/02: Merge branch 'airavata-3420' into develop
Posted by ma...@apache.org.
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
commit 35bbf10eea2272808b18d8fb417ff7cf64042a92
Merge: 333d7f3 4eb4476
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Wed Aug 4 16:10:23 2021 -0400
Merge branch 'airavata-3420' into develop
dev-tools/ansible/inventories/scigap/production/hosts | 3 ++-
.../roles/django/templates/django-ssl-vhost.conf.j2 | 2 +-
.../ansible/roles/django/templates/django-vhost.conf.j2 | 2 +-
.../ansible/roles/django/templates/settings_local.py.j2 | 14 +++++++++++---
4 files changed, 15 insertions(+), 6 deletions(-)
[airavata] 01/02: AIRAVATA-3420 Ansible: updates to refactored
USER_STORAGES setting
Posted by ma...@apache.org.
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
commit 4eb447622c6b395c43270b17a658e78b952f7728
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Wed Aug 4 13:56:38 2021 -0400
AIRAVATA-3420 Ansible: updates to refactored USER_STORAGES setting
---
.../ansible/roles/django/templates/settings_local.py.j2 | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/dev-tools/ansible/roles/django/templates/settings_local.py.j2 b/dev-tools/ansible/roles/django/templates/settings_local.py.j2
index 90e5bda..5fc1d1f 100644
--- a/dev-tools/ansible/roles/django/templates/settings_local.py.j2
+++ b/dev-tools/ansible/roles/django/templates/settings_local.py.j2
@@ -120,9 +120,17 @@ AIRAVATA_API_SECURE = True
AIRAVATA_API_PORT = {{ api_server_port }}
AIRAVATA_API_SECURE = False
{% endif %}
-GATEWAY_DATA_STORE_RESOURCE_ID = '{{ gateway_data_store_resource_id }}'
-GATEWAY_DATA_STORE_DIR = '{{ experiment_data_dir }}'
-GATEWAY_DATA_STORE_HOSTNAME = '{{ gateway_data_store_hostname }}'
+
+USER_STORAGES = {
+ 'default': {
+ 'BACKEND': 'airavata_django_portal_sdk.user_storage.backends.DjangoFileSystemProvider',
+ 'STORAGE_RESOURCE_ID': '{{ gateway_data_store_resource_id }}',
+ 'OPTIONS': {
+ 'directory': '{{ experiment_data_dir }}',
+ }
+ }
+}
+
FILE_UPLOAD_TEMP_DIR = "{{ file_upload_tmp_dir }}"
# Profile Service Configuration