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/04/13 15:53:06 UTC
[airavata] branch develop updated (f0636c5 -> daa822e)
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 f0636c5 Merge branch 'check-ssl-domains' into develop
add 19c817d AIRAVATA-3369 db migration added to ide-integration scripts
add d6ad14d adding apiprod letsencrypt keystore
add d0cac32 Ansible: set api server keystore file to letsencrypt
add fdea18f Adding Ultrascan Django gateway to production
add 4f06799 Adding Ultrascan Django gateway to production
add caea036 Adding Ultrascan Django gateway to production
add 31707f7 Adding Ultrascan Django gateway to production
add a4bc9e7 Adding gateway admins to LSu HPC to get new user notifications
add ccfeb35 Adding googleanalytics to HICOPS gateway
add fac5ff6 Ansible: delta django settings for jupyterhub redirect
add d592ea0 Merge branch 'master' of github.com:apache/airavata
add 18f19be Adding google analytics to LSU HPC gateway
add 9afe03d Ansible: LOGIN_REDIRECT_URL for SimCCS
new daa822e Merge branch 'master' into develop
The 1 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:
.../inventories/scigap/develop/host_vars/simccs/vars.yml | 1 +
.../scigap/production/files/letsencrypt_apiprod.jks | Bin 0 -> 4275 bytes
.../scigap/production/group_vars/all/vars.yml | 2 +-
.../scigap/production/host_vars/delta/vars.yml | 4 ++++
.../scigap/production/host_vars/hicops-deepsnap/vars.yml | 2 +-
.../scigap/production/host_vars/louisiana-state/vars.yml | 4 ++--
.../scigap/production/host_vars/simccs/vars.yml | 1 +
.../{staging => production}/host_vars/ultrascan/vars.yml | 15 +++++++++++----
.../scigap/production/host_vars/ultrascan/vault.yml | 15 +++++++++++++++
dev-tools/ansible/inventories/scigap/production/hosts | 1 +
.../database_scripts/init/03-appcatalog-migrations.sql | 3 +++
.../database_scripts/init/04-expcatalog-migrations.sql | 6 +++++-
12 files changed, 45 insertions(+), 9 deletions(-)
create mode 100644 dev-tools/ansible/inventories/scigap/production/files/letsencrypt_apiprod.jks
copy dev-tools/ansible/inventories/scigap/{staging => production}/host_vars/ultrascan/vars.yml (63%)
create mode 100644 dev-tools/ansible/inventories/scigap/production/host_vars/ultrascan/vault.yml
[airavata] 01/01: Merge branch 'master' 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 daa822e141511ba7702397d05d96052d7ddfda5a
Merge: f0636c5 9afe03d
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Tue Apr 13 11:52:25 2021 -0400
Merge branch 'master' into develop
.../scigap/develop/host_vars/simccs/vars.yml | 1 +
.../production/files/letsencrypt_apiprod.jks | Bin 0 -> 4275 bytes
.../scigap/production/group_vars/all/vars.yml | 2 +-
.../scigap/production/host_vars/delta/vars.yml | 4 ++++
.../production/host_vars/hicops-deepsnap/vars.yml | 2 +-
.../production/host_vars/louisiana-state/vars.yml | 4 ++--
.../scigap/production/host_vars/simccs/vars.yml | 1 +
.../{louisiana-state => ultrascan}/vars.yml | 22 ++++++++++-----------
.../production/host_vars/ultrascan/vault.yml | 15 ++++++++++++++
.../ansible/inventories/scigap/production/hosts | 1 +
.../init/03-appcatalog-migrations.sql | 3 +++
.../init/04-expcatalog-migrations.sql | 6 +++++-
12 files changed, 45 insertions(+), 16 deletions(-)
diff --cc modules/ide-integration/src/main/containers/database_scripts/init/03-appcatalog-migrations.sql
index 322d5af,df81298..e3a1c33
--- a/modules/ide-integration/src/main/containers/database_scripts/init/03-appcatalog-migrations.sql
+++ b/modules/ide-integration/src/main/containers/database_scripts/init/03-appcatalog-migrations.sql
@@@ -11,6 -11,9 +11,9 @@@ CREATE INDEX IF NOT EXISTS I_CMPTN_Q_RE
ALTER TABLE COMPUTE_RESOURCE_RESERVATION ADD CONSTRAINT FK_COMPUTE_RESOURCE_RESERVATION FOREIGN KEY IF NOT EXISTS (RESOURCE_ID, GROUP_RESOURCE_PROFILE_ID) REFERENCES GROUP_COMPUTE_RESOURCE_PREFERENCE (RESOURCE_ID, GROUP_RESOURCE_PROFILE_ID) ON DELETE CASCADE;
-- AIRAVATA-3327: Remove deprecated reservation fields
-alter table GROUP_COMPUTE_RESOURCE_PREFERENCE drop column IF EXISTS RESERVATION;
-alter table GROUP_COMPUTE_RESOURCE_PREFERENCE drop column IF EXISTS RESERVATION_START_TIME;
-alter table GROUP_COMPUTE_RESOURCE_PREFERENCE drop column IF EXISTS RESERVATION_END_TIME;
+--alter table GROUP_COMPUTE_RESOURCE_PREFERENCE drop column IF EXISTS RESERVATION;
+--alter table GROUP_COMPUTE_RESOURCE_PREFERENCE drop column IF EXISTS RESERVATION_START_TIME;
+--alter table GROUP_COMPUTE_RESOURCE_PREFERENCE drop column IF EXISTS RESERVATION_END_TIME;
+
+ -- AIRAVATA-3369: Convert USER_FRIENDLY_DESC from VARCHAR to TEXT (CLOB)
+ alter table APPLICATION_INPUT modify column USER_FRIENDLY_DESC TEXT;