[airavata] 01/01: Merge branch 'master' into develop

[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;