You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by er...@apache.org on 2021/02/01 18:45:34 UTC

[airavata] branch develop updated (ba8e0ea -> a252e9c)

This is an automated email from the ASF dual-hosted git repository.

eroma pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git.


    from ba8e0ea  Merge branch 'airavata-3401' into develop
     new 2725c42  Adding new JS IP address for dev amp gateway
     new 2a4ca69  Merge branch 'develop' of github.com:apache/airavata into develop
     new a252e9c  Adding new JS IP address for dev amp gateway

The 3 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/develop/hosts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)


[airavata] 03/03: Adding new JS IP address for dev amp gateway

Posted by er...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

eroma pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git

commit a252e9c322cfc2dacb34eca6cabe7eebb3de8633
Author: eroma2014 <er...@gmail.com>
AuthorDate: Mon Feb 1 13:45:20 2021 -0500

    Adding new JS IP address for dev amp gateway
---
 dev-tools/ansible/inventories/scigap/develop/hosts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-tools/ansible/inventories/scigap/develop/hosts b/dev-tools/ansible/inventories/scigap/develop/hosts
index a3e0f47..920a0e2 100644
--- a/dev-tools/ansible/inventories/scigap/develop/hosts
+++ b/dev-tools/ansible/inventories/scigap/develop/hosts
@@ -39,7 +39,7 @@ amp ansible_host=149.165.170.199
 geo ansible_host=149.165.156.46
 delta ansible_host=149.165.169.250
 
-#149.165.169.129 149.165.170.199
+#149.165.169.129
 
 [helix]
 149.165.157.37


[airavata] 02/03: Merge branch 'develop' of github.com:apache/airavata into develop

Posted by er...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

eroma pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git

commit 2a4ca69878f988bdcde8bb710104b22c3fdbd169
Merge: 2725c42 ba8e0ea
Author: eroma2014 <er...@gmail.com>
AuthorDate: Mon Feb 1 13:44:43 2021 -0500

    Merge branch 'develop' of github.com:apache/airavata into develop

 .../core/impl/TenantManagementKeycloakImpl.java    | 28 ++++++----
 .../service/security/KeyCloakSecurityManager.java  | 15 +++--
 .../security/KeyCloakSecurityManagerTest.java      |  1 +
 .../scigap/develop/group_vars/all/vars.yml         |  6 +-
 .../scigap/production/group_vars/all/vars.yml      |  6 +-
 .../production/host_vars/covid-geoact/vars.yml     | 54 ++++++++++++++++++
 .../production/host_vars/covid-geoact/vault.yml    | 15 +++++
 .../scigap/production/host_vars/geo/vars.yml       | 64 ++++++++++++++++++++++
 .../scigap/production/host_vars/geo/vault.yml      | 15 +++++
 .../production/host_vars/pace-gatech/vars.yml      |  2 +-
 .../ansible/inventories/scigap/production/hosts    |  2 +
 .../scigap/staging/group_vars/all/vars.yml         |  6 +-
 .../templates/airavata-server.properties.j2        |  4 +-
 dev-tools/ansible/roles/common/defaults/main.yml   |  1 -
 dev-tools/ansible/roles/common/tasks/main.yml      |  1 +
 dev-tools/ansible/roles/django/defaults/main.yml   |  1 +
 .../django/templates/django-ssl-vhost.conf.j2      |  9 +++
 .../roles/django/templates/django-vhost.conf.j2    |  9 +++
 .../ansible/roles/keycloak/templates/vhost.conf.j2 |  2 +-
 .../airavata/helix/adaptor/PoolingSSHJClient.java  |  2 +-
 .../helix/adaptor/wrapper/SFTPClientWrapper.java   |  1 -
 .../task/submission/config/GroovyMapBuilder.java   |  2 +-
 .../airavata/common/utils/ApplicationSettings.java |  4 ++
 .../src/main/resources/airavata-server.properties  |  4 +-
 .../expcatalog/ExperimentSummaryRepository.java    | 12 ++--
 .../airavata/registry/core/utils/DBConstants.java  |  2 +-
 .../ExperimentSummaryRepositoryTest.java           | 18 ++++++
 .../DeltaScripts/appCatalog_schema_delta.sql       |  1 +
 .../registry/server/SharingRegistryServer.java     |  4 +-
 29 files changed, 249 insertions(+), 42 deletions(-)


[airavata] 01/03: Adding new JS IP address for dev amp gateway

Posted by er...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

eroma pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git

commit 2725c4257aa1536926dea523cc376ed2eb46a421
Author: eroma2014 <er...@gmail.com>
AuthorDate: Mon Feb 1 13:44:14 2021 -0500

    Adding new JS IP address for dev amp gateway
---
 dev-tools/ansible/inventories/scigap/develop/hosts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dev-tools/ansible/inventories/scigap/develop/hosts b/dev-tools/ansible/inventories/scigap/develop/hosts
index 6e96fe7..a3e0f47 100644
--- a/dev-tools/ansible/inventories/scigap/develop/hosts
+++ b/dev-tools/ansible/inventories/scigap/develop/hosts
@@ -35,10 +35,12 @@ pfec-hydro ansible_host=149.165.156.46
 cyberwater ansible_host=149.165.156.46
 mines ansible_host=149.165.156.46
 distantr ansible_host=149.165.156.46
-amp ansible_host=149.165.169.129
+amp ansible_host=149.165.170.199
 geo ansible_host=149.165.156.46
 delta ansible_host=149.165.169.250
 
+#149.165.169.129 149.165.170.199
+
 [helix]
 149.165.157.37