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 2020/01/31 21:20:33 UTC
[airavata] branch RPID+SEAGrid updated (06efd19 -> bb98732)
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a change to branch RPID+SEAGrid
in repository https://gitbox.apache.org/repos/asf/airavata.git.
from 06efd19 Committing changes to RPID+SEAGrid gateway
add 59972be Ansible: beta.simccs.org: temporary deploy of feature branch
add cea84c3 Ansible: disable tus uploads on delta
add 2aa1e53 Ansible: move simccs to dedicated vm
add e120dba Ansible: updating ssh key for delta storage pref
add f9acba9 Ansible: change label on CILogon auth option
add d8aacab Ansible: configure virtual host timeout
add 1082e09 Merge branch 'ansible-django-vhost-timeout' into develop
add e6a927c Ansible: bump up timeout for beta.simccs.org
add d520224 Ansible: switch beta.simccs.org back to dev branch
add 1f47bf0 Adding ssl certificate to amp dev portal
add 6d6a6b0 adding CILogon to the CSG LSU gateway
add 7d307e4 adding CILogon to the CGPExplorer gateway
add 46df96f Deploying SMALTR gateway
add 67aad5b Deploying SMALTR gateway
add 6f143c4 Deploying SMALTR gateway
add 3aa3dca Deploying SMALTR gateway
add 93ab557 Deploying SMALTR gateway
add f6178d0 Ansible: require that external be defined and non empty
add df631a3 Fixing the bug of only cancelling one job in remote job cancellation
add 77b4f24 AIRAVATA-3291 Ansible: SELinux relabelfrom/to for django uploads
add 7f606b4 Merge branch 'AIRAVATA-3291' into develop
add 43f10d3 Ansible: use real data dir for user_data_dir
add 424a4cf Adding CILogon to dev amp gateway
add 55ae6c0 Adding CILogon to dev amp gateway
add e6630c8 Adding CILogon to dev amp gateway
add ad5ce3b Adding CILogon to dev amp gateway
add a2dad12 Deploying SMALTR gateway
add 10aaaf7 Deploying SMALTR gateway
add a78af84 Deploying SMALTR gateway
add 863f2be Merge branch 'master' of https://github.com/apache/airavata
add eef825a Merge branch 'master' of https://github.com/apache/airavata
add 3a17b0f Merge branch 'master' of https://github.com/apache/airavata
add 8dac096 Addding cilogon to smaltr gateway
add a039d05 Fixing max poll records in Kafka consumer and ansible fixes
add 594f7b7 Ansible: exclude /dreg/gbrowser from HTTPS
add 205301d Adding topPIC gateway
add a01fae3 Adding topPIC gateway
add 7c6024b Adding topPIC gateway
add de1f1b8 Adding topPIC gateway
add 4bd6725 Adding SSH key to Smaltr gateway
add 81259e7 Adding SSH key to Smaltr gateway
add 1815459 Adding CILogon to TopPIC gateway
add 07af7da Adding SSH key to TopPIC gateway
add 334e72c Ansible: django OS library dependencies
add a2718ab AIRAVATA-3293 Fix join from JobStatusEntity->JobEntity
add 73ca271 Merge branch 'AIRAVATA-3293--Job---JobStatus-entity-mapping-issue' into develop
new ca9671d Ansible: control setting django KEYCLOAK_CA_CERTFILE setting
new bb98732 Merge branch 'develop' into RPID+SEAGrid
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:
.../scigap/develop/group_vars/django/vars.yml | 1 +
.../scigap/develop/host_vars/amp/vars.yml | 16 ++---
.../simccs/files/django-ssl-vhost.conf.j2 | 1 +
.../scigap/develop/host_vars/simccs/vars.yml | 7 ++-
.../scigap/production/group_vars/all/vars.yml | 7 +++
.../scigap/production/group_vars/django/vars.yml | 1 +
.../scigap/production/host_vars/cgpe/vars.yml | 8 +--
.../scigap/production/host_vars/csbglsu/vars.yml | 8 +--
.../scigap/production/host_vars/delta/vars.yml | 3 +-
.../files/django-ssl-vhost.conf.j2 | 16 +++--
.../scigap/production/host_vars/dreg/vars.yml | 1 +
.../scigap/production/host_vars/newsimccs/vars.yml | 70 ----------------------
.../production/host_vars/newsimccs/vault.yml | 15 -----
.../scigap/production/host_vars/simccs/vars.yml | 15 +++--
.../host_vars/{pace-gatech => smaltr}/vars.yml | 22 +++----
.../scigap/production/host_vars/smaltr/vault.yml | 15 +++++
.../scigap/production/host_vars/testdrive/vars.yml | 2 +-
.../host_vars/{pace-gatech => toppic}/vars.yml | 22 +++----
.../scigap/production/host_vars/toppic/vault.yml | 15 +++++
.../ansible/inventories/scigap/production/hosts | 5 +-
.../scigap/staging/group_vars/django/vars.yml | 1 +
dev-tools/ansible/roles/django/defaults/main.yml | 8 +++
.../django/templates/django-ssl-vhost.conf.j2 | 1 +
.../roles/django/templates/django-vhost.conf.j2 | 1 +
.../roles/django/templates/settings_local.py.j2 | 6 +-
.../files/django-httpd.te} | 11 ++--
.../ansible/roles/django_setup/tasks/main.yml | 33 ++++++++++
dev-tools/ansible/roles/httpd/handlers/main.yml | 4 +-
.../templates/email-monitor/email-config.yaml.j2 | 1 +
.../task/cancel/RemoteJobCancellationTask.java | 6 +-
.../helix/impl/workflow/PostWorkflowManager.java | 1 +
.../core/entities/expcatalog/JobStatusEntity.java | 7 ++-
32 files changed, 181 insertions(+), 149 deletions(-)
rename dev-tools/ansible/inventories/scigap/production/host_vars/{newsimccs => dreg}/files/django-ssl-vhost.conf.j2 (89%)
delete mode 100644 dev-tools/ansible/inventories/scigap/production/host_vars/newsimccs/vars.yml
delete mode 100644 dev-tools/ansible/inventories/scigap/production/host_vars/newsimccs/vault.yml
copy dev-tools/ansible/inventories/scigap/production/host_vars/{pace-gatech => smaltr}/vars.yml (57%)
create mode 100644 dev-tools/ansible/inventories/scigap/production/host_vars/smaltr/vault.yml
copy dev-tools/ansible/inventories/scigap/production/host_vars/{pace-gatech => toppic}/vars.yml (55%)
create mode 100644 dev-tools/ansible/inventories/scigap/production/host_vars/toppic/vault.yml
copy dev-tools/ansible/roles/{database/files/mysql-tmp.te => django_setup/files/django-httpd.te} (78%)
[airavata] 02/02: Merge branch 'develop' into RPID+SEAGrid
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch RPID+SEAGrid
in repository https://gitbox.apache.org/repos/asf/airavata.git
commit bb987327ab99589978937d11a86548d875aedd95
Merge: 06efd19 ca9671d
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Fri Jan 31 16:19:51 2020 -0500
Merge branch 'develop' into RPID+SEAGrid
.../scigap/develop/group_vars/django/vars.yml | 1 +
.../scigap/develop/host_vars/amp/vars.yml | 16 ++---
.../simccs/files/django-ssl-vhost.conf.j2 | 1 +
.../scigap/develop/host_vars/simccs/vars.yml | 7 ++-
.../scigap/production/group_vars/all/vars.yml | 7 +++
.../scigap/production/group_vars/django/vars.yml | 1 +
.../scigap/production/host_vars/cgpe/vars.yml | 8 +--
.../scigap/production/host_vars/csbglsu/vars.yml | 8 +--
.../scigap/production/host_vars/delta/vars.yml | 3 +-
.../files/django-ssl-vhost.conf.j2 | 16 +++--
.../scigap/production/host_vars/dreg/vars.yml | 1 +
.../scigap/production/host_vars/newsimccs/vars.yml | 70 ----------------------
.../production/host_vars/newsimccs/vault.yml | 15 -----
.../scigap/production/host_vars/simccs/vars.yml | 15 +++--
.../host_vars/{testdrive => smaltr}/vars.yml | 26 ++++----
.../scigap/production/host_vars/smaltr/vault.yml | 15 +++++
.../scigap/production/host_vars/testdrive/vars.yml | 2 +-
.../host_vars/{testdrive => toppic}/vars.yml | 26 ++++----
.../scigap/production/host_vars/toppic/vault.yml | 15 +++++
.../ansible/inventories/scigap/production/hosts | 5 +-
.../scigap/staging/group_vars/django/vars.yml | 1 +
dev-tools/ansible/roles/django/defaults/main.yml | 8 +++
.../django/templates/django-ssl-vhost.conf.j2 | 1 +
.../roles/django/templates/django-vhost.conf.j2 | 1 +
.../roles/django/templates/settings_local.py.j2 | 6 +-
.../files/django-httpd.te} | 14 +++--
.../ansible/roles/django_setup/tasks/main.yml | 33 ++++++++++
dev-tools/ansible/roles/httpd/handlers/main.yml | 4 +-
.../templates/email-monitor/email-config.yaml.j2 | 1 +
.../task/cancel/RemoteJobCancellationTask.java | 6 +-
.../helix/impl/workflow/PostWorkflowManager.java | 1 +
.../core/entities/expcatalog/JobStatusEntity.java | 7 ++-
32 files changed, 190 insertions(+), 151 deletions(-)
diff --cc dev-tools/ansible/roles/httpd/handlers/main.yml
index f359f2d,dec326a..e5bfb0a
--- a/dev-tools/ansible/roles/httpd/handlers/main.yml
+++ b/dev-tools/ansible/roles/httpd/handlers/main.yml
@@@ -22,5 -22,7 +22,5 @@@
# Gracefully reload httpd
- name: restart httpd
- service: name=httpd state=reloaded enabled=yes
- become: yes
+ service: name={{ httpd_name[ansible_os_family] }} state=reloaded enabled=yes
+ become: yes
-
-#{{ httpd_name[ansible_os_family] }}
[airavata] 01/02: Ansible: control setting django
KEYCLOAK_CA_CERTFILE setting
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch RPID+SEAGrid
in repository https://gitbox.apache.org/repos/asf/airavata.git
commit ca9671ddbe058d2bc7473985f2542561377c7d1a
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Fri Jan 31 16:07:28 2020 -0500
Ansible: control setting django KEYCLOAK_CA_CERTFILE setting
---
.../ansible/inventories/scigap/develop/group_vars/django/vars.yml | 1 +
.../inventories/scigap/production/group_vars/django/vars.yml | 1 +
.../ansible/inventories/scigap/staging/group_vars/django/vars.yml | 1 +
dev-tools/ansible/roles/django/defaults/main.yml | 7 +++++++
dev-tools/ansible/roles/django/templates/settings_local.py.j2 | 4 +++-
5 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/dev-tools/ansible/inventories/scigap/develop/group_vars/django/vars.yml b/dev-tools/ansible/inventories/scigap/develop/group_vars/django/vars.yml
index babad60..2a544e5 100644
--- a/dev-tools/ansible/inventories/scigap/develop/group_vars/django/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/develop/group_vars/django/vars.yml
@@ -31,3 +31,4 @@ django_database_name: "django_{{ gateway_id }}"
django_hidden_airavata_apps: "['django_airavata_dataparsers']"
django_tus_endpoint: "https://tus.dev.scigap.org/files/"
airavata_django_git_branch: "develop"
+django_keycloak_ca_certfile_path: 'os.path.join(BASE_DIR, "django_airavata", "resources", "incommon_rsa_server_ca.pem")'
diff --git a/dev-tools/ansible/inventories/scigap/production/group_vars/django/vars.yml b/dev-tools/ansible/inventories/scigap/production/group_vars/django/vars.yml
index 8ae8991..cd72b12 100644
--- a/dev-tools/ansible/inventories/scigap/production/group_vars/django/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/group_vars/django/vars.yml
@@ -28,6 +28,7 @@ doc_root_dir: "/var/www/portals/django-{{gateway_id}}"
django_database_name: "django_{{ inventory_hostname }}"
django_hidden_airavata_apps: "['django_airavata_dataparsers']"
django_tus_endpoint: "https://tus.airavata.org/files/"
+django_keycloak_ca_certfile_path: 'os.path.join(BASE_DIR, "django_airavata", "resources", "incommon_rsa_server_ca.pem")'
# Default email settings
portal_email_host: "smtp.gmail.com"
diff --git a/dev-tools/ansible/inventories/scigap/staging/group_vars/django/vars.yml b/dev-tools/ansible/inventories/scigap/staging/group_vars/django/vars.yml
index 76c4dc5..977fcce 100644
--- a/dev-tools/ansible/inventories/scigap/staging/group_vars/django/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/staging/group_vars/django/vars.yml
@@ -28,6 +28,7 @@ doc_root_dir: "/var/www/portals/django-{{gateway_id}}"
django_database_name: "django_{{ inventory_hostname }}"
django_hidden_airavata_apps: "['django_airavata_dataparsers']"
django_tus_endpoint: "https://tus.staging.scigap.org/files/"
+django_keycloak_ca_certfile_path: 'os.path.join(BASE_DIR, "django_airavata", "resources", "incommon_rsa_server_ca.pem")'
# Default email settings
portal_email_host: "smtp.gmail.com"
diff --git a/dev-tools/ansible/roles/django/defaults/main.yml b/dev-tools/ansible/roles/django/defaults/main.yml
index d0276aa..a8011f7 100644
--- a/dev-tools/ansible/roles/django/defaults/main.yml
+++ b/dev-tools/ansible/roles/django/defaults/main.yml
@@ -47,6 +47,13 @@ django_hidden_airavata_apps: "[]"
django_tus_data_dir: "{{user_data_dir}}/tus-temp-dir"
django_file_upload_max_file_size_mb: 64
+# Should be a python expression that evaluates to a string representing a file path. For example:
+# django_keycloak_ca_certfile_path: "/etc/ca.pem"
+# or
+# django_keycloak_ca_certfile_path: 'os.path.join(BASE_DIR, "django_airavata", "resources", "incommon_rsa_server_ca.pem")'
+# By default it has no value meaning system default CA certs will be used for validation.
+django_keycloak_ca_certfile_path:
+
django_wsgi_processes: 2
django_debug: false
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 871c320..978863b 100644
--- a/dev-tools/ansible/roles/django/templates/settings_local.py.j2
+++ b/dev-tools/ansible/roles/django/templates/settings_local.py.j2
@@ -75,7 +75,9 @@ KEYCLOAK_AUTHORIZE_URL = '{{ oauth_service_url }}/realms/{{ tenant_domain }}/pro
KEYCLOAK_TOKEN_URL = '{{ oauth_service_url }}/realms/{{ tenant_domain }}/protocol/openid-connect/token'
KEYCLOAK_USERINFO_URL = '{{ oauth_service_url }}/realms/{{ tenant_domain }}/protocol/openid-connect/userinfo'
KEYCLOAK_LOGOUT_URL = '{{ oauth_service_url }}/realms/{{ tenant_domain }}/protocol/openid-connect/logout'
-KEYCLOAK_CA_CERTFILE = os.path.join(BASE_DIR, "django_airavata", "resources", "incommon_rsa_server_ca.pem")
+{% if django_keycloak_ca_certfile_path %}
+KEYCLOAK_CA_CERTFILE = {{ django_keycloak_ca_certfile_path }}
+{% endif %}
KEYCLOAK_VERIFY_SSL = True
AUTHENTICATION_OPTIONS = {