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 2022/08/17 16:28:16 UTC
[airavata] branch develop updated (eb8cd037e2 -> d03a6e54cb)
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 eb8cd037e2 AIRAVATA-3609 Enable legacy TLS security by disabling system properties
new 4847c7f0b4 AIRAVATA-3609 PGA Ansible updates for Rocky and Ansible 2.13
new a7747e6c26 Merge branch 'dev-scigap-org' into develop
new d03a6e54cb Ansible: make develop-js2 inventory the new develop inventory
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:
.../scigap/develop-js2/files/airavata.jks | 76 -------
.../scigap/develop-js2/files/airavata_sym.jks | 30 ---
.../scigap/develop-js2/files/client_truststore.jks | Bin 6618 -> 0 bytes
.../scigap/develop-js2/files/keycloak.jks | 143 -------------
.../scigap/develop-js2/group_vars/all/vars.yml | 237 ---------------------
.../scigap/develop-js2/group_vars/all/vault.yml | 37 ----
.../scigap/develop-js2/group_vars/django/vars.yml | 52 -----
.../scigap/develop-js2/host_vars/amp/vars.yml | 76 -------
.../scigap/develop-js2/host_vars/amp/vault.yml | 12 --
.../scigap/develop-js2/host_vars/csbglsu/vars.yml | 47 ----
.../scigap/develop-js2/host_vars/csbglsu/vault.yml | 12 --
.../host_vars/custos-testdrive/vars.yml | 56 -----
.../host_vars/custos-testdrive/vault.yml | 12 --
.../develop-js2/host_vars/cyberwater/vars.yml | 46 ----
.../develop-js2/host_vars/cyberwater/vault.yml | 12 --
.../scigap/develop-js2/host_vars/delta/vars.yml | 61 ------
.../scigap/develop-js2/host_vars/delta/vault.yml | 12 --
.../scigap/develop-js2/host_vars/geo/vars.yml | 60 ------
.../scigap/develop-js2/host_vars/geo/vault.yml | 12 --
.../develop-js2/host_vars/interactwel/vars.yml | 56 -----
.../develop-js2/host_vars/interactwel/vault.yml | 12 --
.../scigap/develop-js2/host_vars/mines/vars.yml | 48 -----
.../scigap/develop-js2/host_vars/mines/vault.yml | 12 --
.../scigap/develop-js2/host_vars/nexttdb/vars.yml | 47 ----
.../scigap/develop-js2/host_vars/nexttdb/vault.yml | 12 --
.../develop-js2/host_vars/pfec-hydro/vars.yml | 47 ----
.../develop-js2/host_vars/pfec-hydro/vault.yml | 12 --
.../scigap/develop-js2/host_vars/rnamake/vars.yml | 46 ----
.../scigap/develop-js2/host_vars/rnamake/vault.yml | 12 --
.../scigap/develop-js2/host_vars/saver-x/vars.yml | 47 ----
.../scigap/develop-js2/host_vars/saver-x/vault.yml | 12 --
.../scigap/develop-js2/host_vars/seagrid/vars.yml | 49 -----
.../scigap/develop-js2/host_vars/seagrid/vault.yml | 12 --
.../simccs/files/django-ssl-vhost.conf.j2 | 94 --------
.../scigap/develop-js2/host_vars/simccs/vars.yml | 71 ------
.../scigap/develop-js2/host_vars/simccs/vault.yml | 12 --
.../develop-js2/host_vars/simvascular/vars.yml | 46 ----
.../develop-js2/host_vars/simvascular/vault.yml | 12 --
.../scigap/develop-js2/host_vars/usd/vars.yml | 48 -----
.../scigap/develop-js2/host_vars/usd/vault.yml | 12 --
.../ansible/inventories/scigap/develop-js2/hosts | 40 ----
.../scigap/develop/group_vars/all/vars.yml | 5 +-
.../scigap/develop/group_vars/django/vars.yml | 26 ++-
.../group_vars/django/vault.yml | 0
.../scigap/develop/host_vars/amp/vars.yml | 31 +--
.../scigap/develop/host_vars/amp/vault.yml | 25 +--
.../scigap/develop/host_vars/csbglsu/vars.yml | 6 -
.../scigap/develop/host_vars/csbglsu/vault.yml | 25 +--
.../develop/host_vars/custos-testdrive/vars.yml | 6 -
.../develop/host_vars/custos-testdrive/vault.yml | 25 +--
.../scigap/develop/host_vars/cyberwater/vars.yml | 19 +-
.../scigap/develop/host_vars/cyberwater/vault.yml | 25 +--
.../scigap/develop/host_vars/delta/vars.yml | 26 +--
.../scigap/develop/host_vars/delta/vault.yml | 25 +--
.../scigap/develop/host_vars/geo/vars.yml | 24 +--
.../scigap/develop/host_vars/geo/vault.yml | 25 +--
.../scigap/develop/host_vars/interactwel/vars.yml | 22 +-
.../scigap/develop/host_vars/interactwel/vault.yml | 25 +--
.../scigap/develop/host_vars/mines/vars.yml | 6 -
.../scigap/develop/host_vars/mines/vault.yml | 25 +--
.../scigap/develop/host_vars/nexttdb/vars.yml | 6 -
.../scigap/develop/host_vars/nexttdb/vault.yml | 25 +--
.../scigap/develop/host_vars/pfec-hydro/vars.yml | 6 -
.../scigap/develop/host_vars/pfec-hydro/vault.yml | 25 +--
.../scigap/develop/host_vars/rnamake/vars.yml | 16 +-
.../scigap/develop/host_vars/rnamake/vault.yml | 25 +--
.../scigap/develop/host_vars/saver-x/vars.yml | 6 -
.../scigap/develop/host_vars/saver-x/vault.yml | 25 +--
.../host_vars}/scigap/vars.yml | 0
.../host_vars}/scigap/vault.yml | 0
.../scigap/develop/host_vars/seagrid/vars.yml | 18 +-
.../scigap/develop/host_vars/seagrid/vault.yml | 25 +--
.../scigap/develop/host_vars/simccs/vars.yml | 18 +-
.../scigap/develop/host_vars/simccs/vault.yml | 25 +--
.../scigap/develop/host_vars/simvascular/vars.yml | 6 -
.../scigap/develop/host_vars/simvascular/vault.yml | 25 +--
.../scigap/develop/host_vars/usd/vars.yml | 6 -
.../scigap/develop/host_vars/usd/vault.yml | 25 +--
dev-tools/ansible/inventories/scigap/develop/hosts | 63 +++---
.../scigap/develop/pga_config/scigap/vars.yml | 57 -----
.../scigap/develop/pga_config/scigap/vault.yml | 18 --
.../scigap/develop/pga_config/seagrid/vars.yml | 67 ------
.../scigap/develop/pga_config/seagrid/vault.yml | 18 --
.../scigap/develop/pga_config/simvascular/vars.yml | 65 ------
.../develop/pga_config/simvascular/vault.yml | 18 --
.../scigap/develop/pga_config/testdrive/vars.yml | 65 ------
.../scigap/develop/pga_config/testdrive/vault.yml | 18 --
dev-tools/ansible/roles/pga/tasks/main.yml | 4 +-
88 files changed, 296 insertions(+), 2502 deletions(-)
delete mode 100644 dev-tools/ansible/inventories/scigap/develop-js2/files/airavata.jks
delete mode 100644 dev-tools/ansible/inventories/scigap/develop-js2/files/airavata_sym.jks
delete mode 100644 dev-tools/ansible/inventories/scigap/develop-js2/files/client_truststore.jks
delete mode 100644 dev-tools/ansible/inventories/scigap/develop-js2/files/keycloak.jks
delete mode 100644 dev-tools/ansible/inventories/scigap/develop-js2/group_vars/all/vars.yml
delete mode 100644 dev-tools/ansible/inventories/scigap/develop-js2/group_vars/all/vault.yml
delete mode 100644 dev-tools/ansible/inventories/scigap/develop-js2/group_vars/django/vars.yml
delete mode 100644 dev-tools/ansible/inventories/scigap/develop-js2/host_vars/amp/vars.yml
delete mode 100644 dev-tools/ansible/inventories/scigap/develop-js2/host_vars/amp/vault.yml
delete mode 100644 dev-tools/ansible/inventories/scigap/develop-js2/host_vars/csbglsu/vars.yml
delete mode 100644 dev-tools/ansible/inventories/scigap/develop-js2/host_vars/csbglsu/vault.yml
delete mode 100644 dev-tools/ansible/inventories/scigap/develop-js2/host_vars/custos-testdrive/vars.yml
delete mode 100644 dev-tools/ansible/inventories/scigap/develop-js2/host_vars/custos-testdrive/vault.yml
delete mode 100644 dev-tools/ansible/inventories/scigap/develop-js2/host_vars/cyberwater/vars.yml
delete mode 100644 dev-tools/ansible/inventories/scigap/develop-js2/host_vars/cyberwater/vault.yml
delete mode 100644 dev-tools/ansible/inventories/scigap/develop-js2/host_vars/delta/vars.yml
delete mode 100644 dev-tools/ansible/inventories/scigap/develop-js2/host_vars/delta/vault.yml
delete mode 100644 dev-tools/ansible/inventories/scigap/develop-js2/host_vars/geo/vars.yml
delete mode 100644 dev-tools/ansible/inventories/scigap/develop-js2/host_vars/geo/vault.yml
delete mode 100644 dev-tools/ansible/inventories/scigap/develop-js2/host_vars/interactwel/vars.yml
delete mode 100644 dev-tools/ansible/inventories/scigap/develop-js2/host_vars/interactwel/vault.yml
delete mode 100644 dev-tools/ansible/inventories/scigap/develop-js2/host_vars/mines/vars.yml
delete mode 100644 dev-tools/ansible/inventories/scigap/develop-js2/host_vars/mines/vault.yml
delete mode 100644 dev-tools/ansible/inventories/scigap/develop-js2/host_vars/nexttdb/vars.yml
delete mode 100644 dev-tools/ansible/inventories/scigap/develop-js2/host_vars/nexttdb/vault.yml
delete mode 100644 dev-tools/ansible/inventories/scigap/develop-js2/host_vars/pfec-hydro/vars.yml
delete mode 100644 dev-tools/ansible/inventories/scigap/develop-js2/host_vars/pfec-hydro/vault.yml
delete mode 100644 dev-tools/ansible/inventories/scigap/develop-js2/host_vars/rnamake/vars.yml
delete mode 100644 dev-tools/ansible/inventories/scigap/develop-js2/host_vars/rnamake/vault.yml
delete mode 100644 dev-tools/ansible/inventories/scigap/develop-js2/host_vars/saver-x/vars.yml
delete mode 100644 dev-tools/ansible/inventories/scigap/develop-js2/host_vars/saver-x/vault.yml
delete mode 100644 dev-tools/ansible/inventories/scigap/develop-js2/host_vars/seagrid/vars.yml
delete mode 100644 dev-tools/ansible/inventories/scigap/develop-js2/host_vars/seagrid/vault.yml
delete mode 100644 dev-tools/ansible/inventories/scigap/develop-js2/host_vars/simccs/files/django-ssl-vhost.conf.j2
delete mode 100644 dev-tools/ansible/inventories/scigap/develop-js2/host_vars/simccs/vars.yml
delete mode 100644 dev-tools/ansible/inventories/scigap/develop-js2/host_vars/simccs/vault.yml
delete mode 100644 dev-tools/ansible/inventories/scigap/develop-js2/host_vars/simvascular/vars.yml
delete mode 100644 dev-tools/ansible/inventories/scigap/develop-js2/host_vars/simvascular/vault.yml
delete mode 100644 dev-tools/ansible/inventories/scigap/develop-js2/host_vars/usd/vars.yml
delete mode 100644 dev-tools/ansible/inventories/scigap/develop-js2/host_vars/usd/vault.yml
delete mode 100644 dev-tools/ansible/inventories/scigap/develop-js2/hosts
rename dev-tools/ansible/inventories/scigap/{develop-js2 => develop}/group_vars/django/vault.yml (100%)
rename dev-tools/ansible/inventories/scigap/{develop-js2/pga_config => develop/host_vars}/scigap/vars.yml (100%)
rename dev-tools/ansible/inventories/scigap/{develop-js2/pga_config => develop/host_vars}/scigap/vault.yml (100%)
delete mode 100644 dev-tools/ansible/inventories/scigap/develop/pga_config/scigap/vars.yml
delete mode 100644 dev-tools/ansible/inventories/scigap/develop/pga_config/scigap/vault.yml
delete mode 100644 dev-tools/ansible/inventories/scigap/develop/pga_config/seagrid/vars.yml
delete mode 100644 dev-tools/ansible/inventories/scigap/develop/pga_config/seagrid/vault.yml
delete mode 100644 dev-tools/ansible/inventories/scigap/develop/pga_config/simvascular/vars.yml
delete mode 100644 dev-tools/ansible/inventories/scigap/develop/pga_config/simvascular/vault.yml
delete mode 100644 dev-tools/ansible/inventories/scigap/develop/pga_config/testdrive/vars.yml
delete mode 100644 dev-tools/ansible/inventories/scigap/develop/pga_config/testdrive/vault.yml
[airavata] 02/03: Merge branch 'dev-scigap-org' 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 a7747e6c266ab7a16bcc127b289d50e307429fb6
Merge: eb8cd037e2 4847c7f0b4
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Wed Aug 17 12:20:41 2022 -0400
Merge branch 'dev-scigap-org' into develop
.../scigap/develop-js2/{pga_config => host_vars}/scigap/vars.yml | 0
.../scigap/develop-js2/{pga_config => host_vars}/scigap/vault.yml | 0
dev-tools/ansible/inventories/scigap/develop-js2/hosts | 3 +++
dev-tools/ansible/roles/pga/tasks/main.yml | 4 ++--
4 files changed, 5 insertions(+), 2 deletions(-)
[airavata] 01/03: AIRAVATA-3609 PGA Ansible updates for Rocky and Ansible 2.13
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 4847c7f0b4f6096bfab4bdd16dc3e4150c711854
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Wed Aug 17 12:20:33 2022 -0400
AIRAVATA-3609 PGA Ansible updates for Rocky and Ansible 2.13
---
.../scigap/develop-js2/{pga_config => host_vars}/scigap/vars.yml | 0
.../scigap/develop-js2/{pga_config => host_vars}/scigap/vault.yml | 0
dev-tools/ansible/inventories/scigap/develop-js2/hosts | 3 +++
dev-tools/ansible/roles/pga/tasks/main.yml | 4 ++--
4 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/dev-tools/ansible/inventories/scigap/develop-js2/pga_config/scigap/vars.yml b/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/scigap/vars.yml
similarity index 100%
rename from dev-tools/ansible/inventories/scigap/develop-js2/pga_config/scigap/vars.yml
rename to dev-tools/ansible/inventories/scigap/develop-js2/host_vars/scigap/vars.yml
diff --git a/dev-tools/ansible/inventories/scigap/develop-js2/pga_config/scigap/vault.yml b/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/scigap/vault.yml
similarity index 100%
rename from dev-tools/ansible/inventories/scigap/develop-js2/pga_config/scigap/vault.yml
rename to dev-tools/ansible/inventories/scigap/develop-js2/host_vars/scigap/vault.yml
diff --git a/dev-tools/ansible/inventories/scigap/develop-js2/hosts b/dev-tools/ansible/inventories/scigap/develop-js2/hosts
index 9df05761c5..1c277b3aba 100644
--- a/dev-tools/ansible/inventories/scigap/develop-js2/hosts
+++ b/dev-tools/ansible/inventories/scigap/develop-js2/hosts
@@ -38,3 +38,6 @@ geo ansible_host=web.dev.scigap.org
delta ansible_host=149.165.153.181
; custos-testdrive ansible_host=pgadev.scigap.org
rnamake ansible_host=web.dev.scigap.org
+
+[pga]
+scigap ansible_host=149.165.155.229
diff --git a/dev-tools/ansible/roles/pga/tasks/main.yml b/dev-tools/ansible/roles/pga/tasks/main.yml
index 25c3dfa41f..2da245c206 100644
--- a/dev-tools/ansible/roles/pga/tasks/main.yml
+++ b/dev-tools/ansible/roles/pga/tasks/main.yml
@@ -23,7 +23,7 @@
file: path="{{ doc_root_dir }}" state=directory owner="{{user}}" group="{{group}}"
become: yes
-- include: install_deps_{{ ansible_distribution }}_{{ ansible_distribution_major_version }}.yml
+- include_tasks: install_deps_{{ ansible_distribution }}_{{ ansible_distribution_major_version }}.yml
- name: Git clone php gateway
git:
@@ -119,7 +119,7 @@
become: yes
- name: Run composer install
- composer: command=install working_dir="{{ doc_root_dir }}"
+ composer: command=install working_dir="{{ doc_root_dir }}" no_plugins=yes
become: yes
become_user: "{{user}}"
[airavata] 03/03: Ansible: make develop-js2 inventory the new develop inventory
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 d03a6e54cb387eb4d0d3f363179bcfd0f8b21139
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Wed Aug 17 12:28:01 2022 -0400
Ansible: make develop-js2 inventory the new develop inventory
---
.../scigap/develop-js2/files/airavata.jks | 76 -------
.../scigap/develop-js2/files/airavata_sym.jks | 30 ---
.../scigap/develop-js2/files/client_truststore.jks | Bin 6618 -> 0 bytes
.../scigap/develop-js2/files/keycloak.jks | 143 -------------
.../scigap/develop-js2/group_vars/all/vars.yml | 237 ---------------------
.../scigap/develop-js2/group_vars/all/vault.yml | 37 ----
.../scigap/develop-js2/group_vars/django/vars.yml | 52 -----
.../scigap/develop-js2/host_vars/amp/vars.yml | 76 -------
.../scigap/develop-js2/host_vars/amp/vault.yml | 12 --
.../scigap/develop-js2/host_vars/csbglsu/vars.yml | 47 ----
.../scigap/develop-js2/host_vars/csbglsu/vault.yml | 12 --
.../host_vars/custos-testdrive/vars.yml | 56 -----
.../host_vars/custos-testdrive/vault.yml | 12 --
.../develop-js2/host_vars/cyberwater/vars.yml | 46 ----
.../develop-js2/host_vars/cyberwater/vault.yml | 12 --
.../scigap/develop-js2/host_vars/delta/vars.yml | 61 ------
.../scigap/develop-js2/host_vars/delta/vault.yml | 12 --
.../scigap/develop-js2/host_vars/geo/vars.yml | 60 ------
.../scigap/develop-js2/host_vars/geo/vault.yml | 12 --
.../develop-js2/host_vars/interactwel/vars.yml | 56 -----
.../develop-js2/host_vars/interactwel/vault.yml | 12 --
.../scigap/develop-js2/host_vars/mines/vars.yml | 48 -----
.../scigap/develop-js2/host_vars/mines/vault.yml | 12 --
.../scigap/develop-js2/host_vars/nexttdb/vars.yml | 47 ----
.../scigap/develop-js2/host_vars/nexttdb/vault.yml | 12 --
.../develop-js2/host_vars/pfec-hydro/vars.yml | 47 ----
.../develop-js2/host_vars/pfec-hydro/vault.yml | 12 --
.../scigap/develop-js2/host_vars/rnamake/vars.yml | 46 ----
.../scigap/develop-js2/host_vars/rnamake/vault.yml | 12 --
.../scigap/develop-js2/host_vars/saver-x/vars.yml | 47 ----
.../scigap/develop-js2/host_vars/saver-x/vault.yml | 12 --
.../scigap/develop-js2/host_vars/seagrid/vars.yml | 49 -----
.../scigap/develop-js2/host_vars/seagrid/vault.yml | 12 --
.../simccs/files/django-ssl-vhost.conf.j2 | 94 --------
.../scigap/develop-js2/host_vars/simccs/vars.yml | 71 ------
.../scigap/develop-js2/host_vars/simccs/vault.yml | 12 --
.../develop-js2/host_vars/simvascular/vars.yml | 46 ----
.../develop-js2/host_vars/simvascular/vault.yml | 12 --
.../scigap/develop-js2/host_vars/usd/vars.yml | 48 -----
.../scigap/develop-js2/host_vars/usd/vault.yml | 12 --
.../ansible/inventories/scigap/develop-js2/hosts | 43 ----
.../scigap/develop/group_vars/all/vars.yml | 5 +-
.../scigap/develop/group_vars/django/vars.yml | 26 ++-
.../group_vars/django/vault.yml | 0
.../scigap/develop/host_vars/amp/vars.yml | 31 +--
.../scigap/develop/host_vars/amp/vault.yml | 25 +--
.../scigap/develop/host_vars/csbglsu/vars.yml | 6 -
.../scigap/develop/host_vars/csbglsu/vault.yml | 25 +--
.../develop/host_vars/custos-testdrive/vars.yml | 6 -
.../develop/host_vars/custos-testdrive/vault.yml | 25 +--
.../scigap/develop/host_vars/cyberwater/vars.yml | 19 +-
.../scigap/develop/host_vars/cyberwater/vault.yml | 25 +--
.../scigap/develop/host_vars/delta/vars.yml | 26 +--
.../scigap/develop/host_vars/delta/vault.yml | 25 +--
.../scigap/develop/host_vars/geo/vars.yml | 24 +--
.../scigap/develop/host_vars/geo/vault.yml | 25 +--
.../scigap/develop/host_vars/interactwel/vars.yml | 22 +-
.../scigap/develop/host_vars/interactwel/vault.yml | 25 +--
.../scigap/develop/host_vars/mines/vars.yml | 6 -
.../scigap/develop/host_vars/mines/vault.yml | 25 +--
.../scigap/develop/host_vars/nexttdb/vars.yml | 6 -
.../scigap/develop/host_vars/nexttdb/vault.yml | 25 +--
.../scigap/develop/host_vars/pfec-hydro/vars.yml | 6 -
.../scigap/develop/host_vars/pfec-hydro/vault.yml | 25 +--
.../scigap/develop/host_vars/rnamake/vars.yml | 16 +-
.../scigap/develop/host_vars/rnamake/vault.yml | 25 +--
.../scigap/develop/host_vars/saver-x/vars.yml | 6 -
.../scigap/develop/host_vars/saver-x/vault.yml | 25 +--
.../host_vars/scigap/vars.yml | 0
.../host_vars/scigap/vault.yml | 0
.../scigap/develop/host_vars/seagrid/vars.yml | 18 +-
.../scigap/develop/host_vars/seagrid/vault.yml | 25 +--
.../scigap/develop/host_vars/simccs/vars.yml | 18 +-
.../scigap/develop/host_vars/simccs/vault.yml | 25 +--
.../scigap/develop/host_vars/simvascular/vars.yml | 6 -
.../scigap/develop/host_vars/simvascular/vault.yml | 25 +--
.../scigap/develop/host_vars/usd/vars.yml | 6 -
.../scigap/develop/host_vars/usd/vault.yml | 25 +--
dev-tools/ansible/inventories/scigap/develop/hosts | 63 +++---
.../scigap/develop/pga_config/scigap/vars.yml | 57 -----
.../scigap/develop/pga_config/scigap/vault.yml | 18 --
.../scigap/develop/pga_config/seagrid/vars.yml | 67 ------
.../scigap/develop/pga_config/seagrid/vault.yml | 18 --
.../scigap/develop/pga_config/simvascular/vars.yml | 65 ------
.../develop/pga_config/simvascular/vault.yml | 18 --
.../scigap/develop/pga_config/testdrive/vars.yml | 65 ------
.../scigap/develop/pga_config/testdrive/vault.yml | 18 --
87 files changed, 294 insertions(+), 2503 deletions(-)
diff --git a/dev-tools/ansible/inventories/scigap/develop-js2/files/airavata.jks b/dev-tools/ansible/inventories/scigap/develop-js2/files/airavata.jks
deleted file mode 100644
index 4124c405bc..0000000000
--- a/dev-tools/ansible/inventories/scigap/develop-js2/files/airavata.jks
+++ /dev/null
@@ -1,76 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-32656330396637356236343162313734356339656337633933323238656630646566366533646333
-3139613434336665386532326136353266373839376563630a313865376639663637643130386364
-65313436343330303437613639653833333530383130383266643963336334373366353062393762
-6534303635313039320a643139666331343435303037356139663235613437653235326666396132
-38376233343461656232353963306362383435323061623164623135613538376161656533306464
-64613637303666323439306466666266363764306133346132393931383631393964363864343037
-31353737323039303961643933316164653635326333633930343665616135646338386661316231
-31303462366239326664326139353433343232363061363464356236353938343338306562363864
-30616137343539656237303030343863613432646366383232396262373538663030666332303061
-38383630613535663332323830303130313039393430656666316361383335326164393138393062
-37663535326533333239613364656638313239663365353261633934656132633732333332366337
-35613733666466363662633363633530376133663436653462656538346134353965303561643031
-65376462663964323137356264303831383933303862393435313633333337303635336133613932
-35356439326431353932333839643433326430653638626231663733326464643338323639656334
-31363433656163643136396132633766343937313331363537353930643331346135643663373535
-65343164313065396634636330626130643165336365663166343035363238316630626433653032
-65323561366363366561396562346533653135623565666166373230303862376463316637313734
-39373166626633626266306538373138303131343665316165346530363061656130333739363865
-31326631316130306331353034306663643531646635373638356164613333353536356634346236
-30663034613936303861636561633761663335326534393236646633333261663136643831396637
-62326135646265306662336239326363613736323162633933326636303536633263323437373262
-63393438623834626337626438393332353838316336666136663364353431623530653633626561
-66646238323238643963653162323136636265396333313236626632353237393565363462633734
-33666533303132306563346538393433663161623832613065346136376532343131383830353438
-65306235336534313733393238646235616366383035303566616330633437393132363262316337
-38626135626537353664376133323466373939323638616630633538663533313061373763373535
-33343564623963613336396463333361383534333735353261353639373435393466346131356562
-33366262376533393161613932343938396136663532373231626362356663386263613332323539
-38613666356430653537326663303331613431353434663737323935326566656461653630306436
-66393337323938373030616563373639623665653332643335653861643034346239666337336132
-31663463343530313964303232633662383535313436626361313236653466353538313663636235
-31316261323134646639383865613434643762346562323337333662306162333936373863656135
-35666462653631366136623137613131333962363030646531396366633030666632376439373036
-35393932633333653535363266626665363662663237303766666332326161306666333061646231
-37626637653365343962653336326332353739333664393831653132636431656439633134383139
-64363035353236333835393932616263346334346162376261643931396137656338373437643736
-37643364616264306531616534396332303932636336656434376663393265636135346262346562
-36633833393265356530646633343866646635643932336430363634313237363637653965633438
-32323534383164376563323136666533373338333766343663326566613364636136303461393232
-65306635326663633836386166383564363832356166616439373833346561623436373635393533
-34393930393764393363363330646161346331376636666132656662626434353338343861373964
-66633561396338306339393665633565643366666130643235613732626637643133656465316264
-37306230323665343730363761643637336665313437366366346139643137313165623339663436
-61663863366134666163616438326639636132643331613265353831383134356133376131333538
-30663132306633646264333931656233613039353830363135396364383730663133313730323739
-38336537663830333466663033653361636332303534356630333730303731613539633635636230
-33326233663763653039303131656437326361306537396130353162373333616339363930363637
-38333963306235333837303361386332383762306130393338373034633334313835613565623865
-32333330616337656566346231393636363061326364633136626539313634396337636661313838
-34636464303863636639666231363965316336646461383234656161663035366330643039386266
-62343564353835386637626165663438353739386538326463303832633765323563383036386437
-32633065303532303631356236383862316563346237653562393033623035636431343138646237
-62386463353862643865333836613938653561316335366563323338643834616634383361346162
-61343436356638333965396238623639303631386363373432323032636139633962366262316438
-33313065653130366235613133303130306362623133386239323637626561643536653830663038
-36363463313838366461626639636139616462336335373438613230663536346332656436653235
-61316439343731646631663133393065313462643230643162313462343365656431363438613933
-65343032653038633330653734356439353537363236343163623138333836663862383035373537
-31626136363232666362613036366536323533386534366264636131656362373963643137333830
-34373039653939313863303736643761376332313161343232323863323832313631366138396661
-64323638383532333263316132303538376631396637656463366430343865633061363636373834
-33373163376239356433373230323561343830326434316661346433323233353933313632666533
-63626130393866653866656231386532373461346236653363653338396165663431383438386166
-63636230643439626337386638613662646636326435313937623334333933303431653335663333
-35313935613034353865383633643334333865386262353632353632383933636161343638303033
-66373037353435386263396664333335323932616137653839323133323032386265306562393561
-64643831353835366365623531626661626466366563666431396233396634353731613033376265
-65366231653562393233386231333435366438663932393962326464666161643666303932306132
-35383338333533343133636662316635343531303535383237653866353563623333333838383138
-33333439383661666637306531313865343164653633323962346430653762386230313035336664
-63336634633434346164313664613539613832643939633331643132363232396637376234353539
-32653136363135646431376131373632353363383239303536343865373632366337333261353935
-34323466396430363830303332376434343534623037613862323732336566623366333861373134
-64373535336133616537613362646164366237343433363838663731353961376538346534646337
-373637313538306332616430383839623432
diff --git a/dev-tools/ansible/inventories/scigap/develop-js2/files/airavata_sym.jks b/dev-tools/ansible/inventories/scigap/develop-js2/files/airavata_sym.jks
deleted file mode 100644
index 13ccf1bb7b..0000000000
--- a/dev-tools/ansible/inventories/scigap/develop-js2/files/airavata_sym.jks
+++ /dev/null
@@ -1,30 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-66393935613465373265366662383133353632633262353839623837636364373339336564636265
-3862663231313565313064643833646530636361333866610a636266666561306263343632663734
-33306432363830323132653038326139323464393065313631373936346162386161626461396530
-3061376439346264310a346630616535326435626235393564643062326665313239373839336331
-38316134613764373336333338323263356563396638303932656562336538333137643131373366
-35653334383566313262336261623339626532333634363531313534353762356534643961646338
-34633938333436333135643736663437373532633061366464343632643366343337366262386465
-33373333333033303262316566346565613731633361333438363063616165333231323635646333
-34303463656431663932326464356332353235336238653462663463373332656231373562626664
-65346131663064376232643435653264383465323761373063366162663236323935373139386138
-39623734643064623635376261646465383663613238623531613066306464326662346532346365
-63623064383436303634393639316638366136653563663930303130643531373166613133653338
-36636433626539366661656164613032653931356561336336343561323962336462383164393463
-65353265363535616136306136353064346561666439663532626234363763653535663061386232
-61663566343361666634346134623538366664396236346365336431383937653761643235613661
-32373439656332306536623336343763386364363265306138356138616464656662363434636531
-30646163333462636236336532383964643234616131663465666663633333343366376134666263
-63353161336366613065303434656537396237643938376233333431663232356630373038333835
-37306162623439323062626532656633646138386131643037323566643264653432633735333362
-65613564393232393433646334376639356564376661663430353630626534336566663061303632
-64633235333463626435323134636333353536393936663539663539336233363934333931323961
-63313739333733613465376334336239306633636136383831396533326530616133373366653531
-33356137656636323037303430623065393930633731346634346161633334313362613136313138
-36633835353665626462363031653161646530366339363732373865343136356637326631386437
-30383235306538303261613262376634303164313862366330393463346261363866346336666136
-37333566396436383534633330316465306461383537616661343265663731363561323137303164
-36336532333233343463633064346162646562613332646331343931363838333739636335376331
-66626436313938346362303932336339636434666665373862306462646162393066303338383265
-64363138663564386332383032366265666565643633393236663830313936343637
diff --git a/dev-tools/ansible/inventories/scigap/develop-js2/files/client_truststore.jks b/dev-tools/ansible/inventories/scigap/develop-js2/files/client_truststore.jks
deleted file mode 100644
index f45fc52ba3..0000000000
Binary files a/dev-tools/ansible/inventories/scigap/develop-js2/files/client_truststore.jks and /dev/null differ
diff --git a/dev-tools/ansible/inventories/scigap/develop-js2/files/keycloak.jks b/dev-tools/ansible/inventories/scigap/develop-js2/files/keycloak.jks
deleted file mode 100644
index c896d03bf6..0000000000
--- a/dev-tools/ansible/inventories/scigap/develop-js2/files/keycloak.jks
+++ /dev/null
@@ -1,143 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-66353964396536666532306233383464343935653932393865616364373334333365346439633266
-6634663634323434643464633734316137336562653463340a383030363463386465303639626439
-36303865353236336132663634626462313266626362613536643532613239346438333834383733
-3339653664613332370a653838373036626231613532653233633732646562353762303530653039
-65613364353436323463616239303538376462643666373063326437313935353839363262333735
-34303838356532636566646530353262613864313236373738626334306563346266393566316163
-62666238633236633231626262333963363366343138646432356366326538353966653630643737
-64306235383835343236643962343164653531616333373933633139326465336331666634373839
-63373361313232383661366264336261383635313138323362636664643065303661666138366332
-39343164346434373137663266636538333661643836633531333363616138313165363833623966
-63613462343332393962363436366637353065303435333236666661356436366136643338326664
-66313664616535626438363230313765663431333266636466363233383735313534356635663230
-64656638303730613337616137363930373631616137393438623032326236613037663232336233
-61646565656630333864666364616231653465653264633838363832623232666366666235623832
-36343139363466633132396461333335393862383939363834366434333561393734666465366464
-30626135393766366665613336623564643832343130396365643838363863383134363932633165
-62393730323636343862396635306463666230363231393633363631333732653935333939336435
-30643331383165626666353937623039323434333631356631336435646635656461616663393763
-61303634626632356630343039333438363034663566313230396363353963313766393536646131
-34336561366662366232383463376664383565346135386663363363373432316238323162333063
-32656563383838333338343630376536643764326639613530633866663636646433323830623739
-38326130313337306132373038393637626461396637383031363732646437643036616232323765
-30626662663331326233336163393961666262366230656532323562383761323265343863346562
-30353431343531346535383932663035333135633035643064383132386431346530343562393765
-38366231613566623965363534303762636235613561343963323834356431616537303537306636
-38396463666562306131376138396633373765643233656532396630333232393934396262386561
-62383034326665303436613834366331353562613730633965356339316430363061336237626235
-38656336626330343962343035313237353261366230663738353161353366343561333864333832
-64333131666332636335666530323933626138643637363132353132653061373238636265363734
-37363039336661353966366461353138363130333763313761653234386666366661663734396161
-35333137613262376662396462383637333436393932306134666232303061316332643937653236
-30316336303663303332643431316539326432343864356133633737656331366331663833613230
-65383763316565313962323564616536393265396539313034636635343731396536643733663164
-66316161623162633664333931613233333432303335363461363535643365323133346334626537
-38633039356462333031313239323064303038316564326364306332376432376163356639313732
-66386136626436303061396232363433353533643562633530633430323534353365316531316336
-31653164303166616366633135323661306563376363373839343663643033343736396364646334
-62353939346166333461666131643636663538336531346561316437666531386166633536646435
-33633533326537356530616235306164666231333936386135316362306431393334396466383039
-62653763393165333862383165633030666635323666653930396635373238396636316136633864
-39666237313465313537366330346663316265343638626531343665663062373434323130366366
-61313761363432613464633333383762333137616334343564366638333037326536323035343833
-61633235333238313562393431356538346334613834366434643433663436616339396663326335
-65613134653335373139393437353666623037643939383939373238366235366332383731356132
-30313036656435353663353339343164303536663736376336343461636665303038306137643765
-36343333313364336431353332613665636265336636346536396166323732623630386461636638
-32613139316430663132643138346261353031326639656464303536643736343165336631383739
-30643961643233633238333632313933303434663530666331356666653062663036613862663739
-39343439626533376232626534316333316464303064393338616362626166663332613631363464
-62633634643462346463303961383865343466396336323465663036666534623366633462306330
-63386332666538313265303666343337373864326638313131393365653964316632643536613363
-35353038383565623430376665646264313033323761356138646366623464643232353231323061
-33613936626365303639663361646631653231643938616537653163363439333131373161366639
-35316464383436396536343966383630333539306637353135643663636364303630646133636131
-34383036633539663064656532313730656630666436373638333765343465383865616139623133
-62633764386463346239333536323835613963316661363732663538306335313439386430643032
-62646338633730663438343931333732373966623838313430636137366230353736323034653537
-34646537663263383062643761363738396163386265386565353335616435323736363466353164
-39666365376137326637363661326437383337393234336266393437333063663366383862666162
-65306235626436333237353466303934653436613639303236373932626563356662393463323032
-32373963323964333030663362336435353063366638363830393866393563646663343165353161
-31303832613839613930623732656232306438336463393233326339653636626266666238353462
-39623361376663363833323330333862383237653733636332363934613965633035393337633539
-62613064393338333062333764646332633461626462663863626330636231373366656235323266
-61646636633234656532643235643363626235643938633235633234643834396639353864336365
-36333231626531613538333330323230626264393466373234396634373263323238386465353339
-65626637306537653261623336356363343136363836616635306664303866346262626366386138
-30633539376438653938626264383631353736353133653134306534636632613834366534303439
-35626265663564316266636337646266316430353065303331343462666537633135363363363563
-33613538323564613834363432633261633532353931363730626263396461303034346433666332
-32623439333931363333363533353539306234313063353865333362623839306438633565373730
-35616233313235386338356464336362366166663663343339383937393564313338386566666631
-63373532663363646438363637346139373534363935313833333465363634363861346435366265
-38303634623037663665396337383339366166373164633764383433633663636663663862353135
-66326561663838623865633839616139336633633530626538643661366163376530646233336233
-36333263633036616531633666666539343436336236353431396435336164663363366533356633
-32303730653236656264343365303763646236313461336139353737383233343666636334346565
-38653030616339303763313661333139666535363730656263616663373362353637656434313265
-32613839613336333837636430626166393162653032323130303965663237633962373931346161
-38373364383462376162336335626162346334333564626661643338653637316339613562613137
-62316130306633636431643036376236353438616163383139613630383065346138363530633964
-33326165363431316334616237326635306163633661316161656362373263393561666335623661
-37333839656131353162323731323438343238383435306633373932353135336139643565363939
-32363261633737376138386133366135323563316462616162666137353433333862356234613562
-61306337363736663332623039306136383064396139326433333036386337363031343638333238
-30613862316538666362353634376364656331323965393466386263356166383138346661343764
-64363331633061616233303562373133363164373165613632653235633261353433373932323039
-30646363653938623566336161613166616134353131623564653432646265663532366634393235
-61393335356361333239393634356130636237646437356662366666336164303463333330323930
-32383733663563306336383264633137353138663234643136376232383462663231313634336631
-66636363343230636237303565393363326230376235353735623032336235373266343633333262
-36346462373864313738613330653461363664666434336638396662656161366533643063353337
-63643931313539393266613630633636356439323337353537363061353337396137303531333062
-35393633343132353338373034653061316661366232616234626630613938616164323966333237
-35376233613132383630376661333039316164623332373531323833326538613136333137653837
-39363930376531326632663963323432326562383036623463316161306235303839363333663366
-63356436316439366136333464623134633962633331393131313233346233616536396339613763
-37663265383065396336333861626337336365653436336464643839376136663035393939366164
-39643535343262613630643165333137666663383939393732373563386663333332383537323036
-63633734346164646433383565616565323564636131383738653263313630353638343032353662
-30393661396131633334373065323661646434346433376238616238376261643535396163373139
-63363336666262653664623633303130646132393362323436323964346538333533336265633630
-36616135383665363738643331363936303232393864626364356363663530663565643662663235
-64666666386438626634343064363136393332623034306638356634643335666630623831313365
-61663934346537376264323031356133333639613838303336636537633766623733343536656638
-61326537643265623931393233636363656330663737353737643431633531626164666337656433
-38383631636365373534336131646333333532646633343564353437316339303239626238303638
-30656165333133373063646539373131383339626133643231663331343431616231393939366530
-61363863623830656238336335643163653632663862396165623433356636303337333265633464
-39623037346237363531636432383465313263316633653834636639633461386536626239336233
-35396633363034613430393330643034343338356536663437623238323065303062393131363465
-31353465626562643937623932373862623433653138323339333039386563303834653830366662
-64343064323037633836333138626434366330323230313463353162653639343232326661353231
-30383764343138653363323137366663376666313061313532326661343532633563396537366561
-35396134623139386533626464303766313834303735656161383132643130316136323265393638
-61613635313065303931303066616137343238653639656336666439303530343131623635626237
-64383830666335383037323632306337393366373331323639653964343237396230353466363436
-62326162373137306531353261363130323232613866613639313134623266366162333966303163
-31373839626435646535323730363530613737363838383463303730326433353761336333313032
-65666433663333636362363539643238663937323466653134633161633665613961663265346135
-34393565343530336166313332343562383466333737613266323362353065323732343661356665
-33376337653435633265356230346363666231396563393566373534333430363365383062346335
-61383636616565613362636633613366643666643863376139336435616333353262303031303533
-64323338306463303166373862323537303965336332616236613333643064316137333636633065
-31343266663635383065363432653166633761646336613538643162396566373033363265623465
-62633839376639653132623234343937653831336266333735303232366332356138633061356539
-35343330323739613938646234396362393933356230636364366239393537613638393461626432
-39303632333735653764623738373036616433613939393561353765636361646562316235613762
-36323964303135646666346637303865393966373063363138343333626233326534313962663561
-34333935653563386132316230613362343433396130343239326665323638616165313331623736
-34663339633132376133326361333030363233323836323737333461636263303934396133656630
-36383638313362306166316231313064313064386565386662313239636130663130373665336434
-38303231656432316533643637326131323333313161613333303239633639343964376238393332
-61333637363735663861353231313061393538376436343538343939353433663036656332666436
-61316537316137616635376463633833316262313766636532623664363031313461326539323733
-66363261656435646232633466613838393338376538353031636236393931343465306231633137
-32633766613264363031316635386130623738613161313039626634376233636265623565333137
-62633966383065326539313464306230316564623130633637363830616532383265303038313633
-66333436383664363265323263613936666333643739313530663438303061643535646330306636
-37653161326533346434653238613662313537623566646661353065363963653963653331626462
-37623034303238316132393766346331373561343730393631636663663033366664313535303966
-3963336630363238656363396139346463616266666266363632
diff --git a/dev-tools/ansible/inventories/scigap/develop-js2/group_vars/all/vars.yml b/dev-tools/ansible/inventories/scigap/develop-js2/group_vars/all/vars.yml
deleted file mode 100644
index 53ac27809a..0000000000
--- a/dev-tools/ansible/inventories/scigap/develop-js2/group_vars/all/vars.yml
+++ /dev/null
@@ -1,237 +0,0 @@
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
----
-ansible_connection: ssh
-ansible_user: exouser
-
-user: airavata
-group: airavata
-user_home: "/home/{{ user }}"
-
-# deployment related variables
-deployment_dir: "{{ user_home }}/develop-deployment"
-airavata_source_dir: "{{ user_home }}/develop-source"
-airavata_repo: "https://github.com/apache/airavata.git"
-airavata_dist: "apache-airavata-api-server-0.21-SNAPSHOT"
-airavata_dist_name: "{{ airavata_dist }}-bin.tar.gz"
-git_branch: develop
-
-# Database related variables
-# FIXME: once we get the entire dev stack on the same network we can use the
-# internal ip address instead of the public one
-db_server: "{{ groups['database'][0] }}"
-db_server_port: "3306"
-db_user: "airavata"
-db_password: "{{ vault_db_password }}"
-mysql_root_password: "{{ vault_mysql_root_password }}"
-app_catalog: "app_catalog"
-exp_catalog: "experiment_catalog"
-replica_catalog: "replica_catalog"
-sharing_catalog: "sharing_catalog"
-workflow_catalog: "workflow_catalog"
-credential_store: "credential_store"
-profile_service: "profile_service"
-
-django_db_username: "django"
-django_db_password: "{{ vault_db_password }}"
-
-mysql_connector_jar: "mysql-connector-java-5.1.37-bin.jar"
-
-# Rabbitmq related vareables
-rabbitmq_server: "{{ groups['rabbitmq'][0] }}"
-rabbitmq_vhost: "develop"
-rabbitmq_user: "airavata"
-rabbitmq_password: "{{ vault_rabbitmq_password }}"
-rabbitmq_port: "5672"
-rabbitmq_broker_url: "amqp://{{ rabbitmq_user }}:{{ rabbitmq_password }}@{{ rabbitmq_server}}:{{ rabbitmq_port }}/{{ rabbitmq_vhost }}"
-
-# Zoookeeper related variables
-zookeeper_client_port: 2181
-zookeeper_connection_url: "{{ groups['zookeeper'][0] }}:{{ zookeeper_client_port }}"
-
-# API Server related variables
-api_server_name: "apiserver-node0"
-api_server_host: "{{ groups['api-orch'][0] }}"
-api_server_port: "8930"
-api_secured: "true"
-tls_enable: "true"
-api_server_tls_port: "9930"
-enable_sharing: "true"
-iam_server_url: "https://iamdev.scigap.org/auth"
-iam_server_super_admin_username: "admin"
-iam_server_super_admin_password: "{{ vault_iam_server_super_admin_password }}"
-
-# Orchestrator related variables
-orchestrator_name: "orchestrator-node0"
-orchestrator_host: "{{ groups['api-orch'][0] }}"
-orchestrator_port: "8940"
-api_orch_dir: "{{ deployment_dir }}/api-orchestrator"
-api_orch_log_dir: "{{ api_orch_dir }}/logs"
-
-# registry related variables
-registry_name: regserver-node0
-registry_host: "{{ groups['api-orch'][0] }}"
-registry_port: 8970
-#registry_dir: "{{ deployment_dir }}/registry"
-default_gateway: "default"
-
-# Credential and keystore related variables
-keystore_src_path: "{{inventory_dir}}/files/airavata.jks"
-keystore_passwd: "{{ vault_keystore_passwd }}"
-# client_truststore_src_path: "{{inventory_dir}}/files/client_truststore.jks"
-# client_truststore_passwd: "{{ vault_client_truststore_passwd }}"
-cred_keystore_src_path: "{{inventory_dir}}/files/airavata_sym.jks"
-cred_keystore_passwd: "{{ vault_cred_keystore_passwd }}"
-cred_keystore_alias: "airavata"
-cred_store_server_host: "{{ groups['api-orch'][0] }}"
-cred_store_port: "8960"
-keystores_location: "{{ deployment_dir }}/keystores"
-
-# Gfac related variables
-gfac_name: "gfac-node0"
-gfac_host: "{{ groups['gfac'][0] }}"
-gfac_port: "8950"
-gfac_dir: "{{ deployment_dir }}/gfac-instance"
-gfac_log_dir: "{{ gfac_dir }}/logs"
-
-# Monitoring variables
-monitor_email_address: "devjobs@scigap.org"
-monitor_email_password: "{{ vault_monitor_email_password }}"
-
-# PGA variables
-pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-pga_git_branch: "develop"
-user_data_dir: "/var/www/portals/gateway-user-data"
-real_user_data_dir: "/data/gateway-user-data"
-## Airavata Client related variables
-airavata_server: "tls://{{ groups['api-orch'][0] }}"
-airavata_port: "9930"
-airavata_profile_service_server: "{{ groups['api-orch'][0] }}"
-auth_verify_peer: "true"
-oauth_service_url: "{{ iam_server_url }}"
-
-# Sharing Registry related variables
-sharing_registry_host: "{{ groups['api-orch'][0] }}"
-sharing_registry_port: 7878
-
-# Profile Service related variables
-profile_service_host: "{{ groups['api-orch'][0] }}"
-profile_service_port: 8962
-
-# Keycloak
-keycloak_ssl_keystore_file: "{{ inventory_dir }}/files/keycloak.jks"
-keycloak_ssl_keystore_password: "{{ vault_keycloak_ssl_keystore_password }}"
-keycloak_db_host: "{{ groups['database'][0] }}"
-keycloak_db_username: "keycloak"
-keycloak_db_password: "{{ vault_keycloak_db_password }}"
-keycloak_master_account_username: "admin"
-keycloak_master_account_password: "{{ vault_keycloak_master_account_password }}"
-keycloak_vhost_servername: "iamdev.scigap.org"
-
-# Letsencrypt
-letsencrypt_email: "circ-iu-group@iu.edu"
-
-# Helix
-helix_version: 0.9.9
-helix_url: https://downloads.apache.org/helix/{{helix_version}}/binaries/helix-core-{{helix_version}}-pkg.tar
-helix_dir: "{{ deployment_dir }}/airavata-helix"
-helix_cluster_name: "AiravataDevCluster"
-snapshot_version: "0.21-SNAPSHOT"
-helix_pre_wm_load_balance_clusters: "false"
-helix_post_wm_load_balance_clusters: "false"
-
-# Listening port for kafka installations
-kafka_listener_port: 9092
-kafka_rest_proxy_listener_port: 8082
-
-# Realtime Monitoring related variables
-realtime_monitor_broker_url: "{{ groups['kafka'][0] }}:{{ kafka_listener_port }}"
-realtime_monitor_broker_publisher: "RealtimeProducer"
-realtime_monitor_broker_consumer_group: "monitor"
-realtime_monitor_broker_topic: "helix-airavata-mq"
-
-# Variables related to the broker in which parsed job statuses are published
-job_monitor_broker_url: "{{ groups['kafka'][0] }}:{{ kafka_listener_port }}"
-job_monitor_broker_topic: "parsed-data"
-job_monitor_broker_consumer_group: "MonitoringConsumer"
-
-# Variables related to parser framework
-parser_broker_url: "{{ groups['kafka'][0] }}:{{ kafka_listener_port }}"
-parser_broker_topic: "completed-messages"
-parser_broker_consumer_group: "ParsingConsumer"
-parser_storage_resource_id: "pgadev.scigap.org_7ddf28fd-d503-4ff8-bbc5-3279a7c3b99e"
-parser_broker_publisher_id: "ParserProducer"
-
-thrift_client_pool_abandoned_removal_enabled: true
-thrift_client_pool_abandoned_removal_logged: true
-
-usage_reporting_key: "{{ vault_usage_reporting_key }}"
-
-participant_monitoring_enabled: true
-participant_monitoring_host: "0.0.0.0"
-participant_monitoring_port: 9096
-
-pre_workflow_manager_monitoring_enabled: true
-pre_workflow_manager_monitoring_host: "0.0.0.0"
-pre_workflow_manager_monitoring_port: 9093
-
-post_workflow_manager_monitoring_enabled: true
-post_workflow_manager_monitoring_host: "0.0.0.0"
-post_workflow_manager_monitoring_port: 9094
-
-parser_workflow_manager_monitoring_enabled: true
-parser_workflow_manager_monitoring_host: "0.0.0.0"
-parser_workflow_manager_monitoring_port: 9095
-
-api_server_monitoring_enabled: true
-api_server_monitoring_host: "0.0.0.0"
-api_server_monitoring_port: 9097
-
-# Variables related to data staging operations
-max_archive_size: 21474836480
-
-# Subnet definitions
-iu_subnets:
- - "149.163.0.0/16"
- - "140.182.0.0/16"
- - "149.165.0.0/16"
- - "192.68.133.0/24"
- - "192.12.206.0/24"
- - "149.159.0.0/16"
- - "156.56.0.0/16"
- - "149.161.0.0/16"
- - "149.160.0.0/16"
- - "149.166.0.0/16"
- - "134.68.0.0/16"
- - "129.79.0.0/16"
-
-zk_subnets: "{{ iu_subnets }}"
-kafka_subnets: "{{ iu_subnets }}"
-sharing_subnets: "{{ iu_subnets }}"
-registry_subnets: "{{ iu_subnets }}"
-credential_store_subnets: "{{ iu_subnets }}"
-rabbitmq_subnets: "{{ iu_subnets }}"
-db_subnets: "{{ iu_subnets }}"
-zabbix_subnets: "{{ iu_subnets }}"
-monitoring_subnets: "{{ iu_subnets }}"
-
-# Zabbix
-zabbix_server: "rt-watch.uits.indiana.edu"
diff --git a/dev-tools/ansible/inventories/scigap/develop-js2/group_vars/all/vault.yml b/dev-tools/ansible/inventories/scigap/develop-js2/group_vars/all/vault.yml
deleted file mode 100644
index 5d934806d5..0000000000
--- a/dev-tools/ansible/inventories/scigap/develop-js2/group_vars/all/vault.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-64373730636638343131656234363134393139343231333961323733316533396231376435613131
-6233643639663536643036656666366532396338653963330a386137343537326164626436633463
-64643531303235336334373839383838626236313164383232663466366537303036663638386338
-3962343332643739650a313635616531663837613136393636613432393433656133303834353532
-37393966313739366639616533333361323232376435613031393639613062393538666462303264
-35323239613434623537633833376430386630396565346363653738653662376539346138313832
-30623934663735346135313364636165376138313063323637313730303132383330333330323461
-35636461666134363432633563336333343765343165616531353461353630373661633834656430
-37303966336162346539353733663535336563626163343435666535356231306532393861633239
-35613664386430636164373131353732666232326263613433343965363262633933343336633535
-64343633656432313134383133616462316232383761376533343238653937616161653061646230
-36393232653863363164333361366263386230333964373537333731343338613437666365653330
-61326535303437643334376432643533626533646634313364386137643065383438373438313563
-66383765333536643330613838353535636566646636393332396631666163366335343435663733
-38346438303332396435303861656533306630656561323866356361326663303933313965303166
-64303331343863343236333165333765383931306665616533356163613537346461396665313433
-63346466363165663465636233393334656166373035333630623665633939326563656561383532
-31626365306364393033366166343762646262373637363662666632386333626137343662396632
-34646436333037663363306162383534393136643230306236353230326432393137613232616665
-65653465393963323130316564643734613831303462636163343735346566343961646636623337
-63303131653739363264376466343837653430616634626236643439373334616337366362316432
-62303137323338353933613533393738356333333536373230343832333331336465616332633562
-61313964303831366439386463353632623832326563396665396132336337363937336230363365
-66316464653631656438323362303663386231363665376131643334376434656432393532326338
-63393836643864626136396263613439386361373730303035356562383539623032663863653237
-39356666343438363331353730313035313362663261343130333961346262633464353638626137
-61383834303666366336313363343633383566633762353865663137613732316566323630336262
-62363763656166323363316261306663643462373636383961626531376238663136316335303061
-31656465373132646437343039323337643033613064663434633931343861393032393530386534
-63396132646262323562646134323432653962653835313164626232656464633638313862366431
-30386564363430363764656135633432653635376237353139383365333039656134353461346665
-37356662323133623764643362336436643332326131353535303664663065653432303133633332
-64346337616162613761663737633135373766356461633965643834313062383639343063613861
-38313835656266633766623231396239373530636264376262633664326466353034343830336263
-31633634346661306433646266646233393339333365336161656663656230643734613034306635
-32623633303461633961
diff --git a/dev-tools/ansible/inventories/scigap/develop-js2/group_vars/django/vars.yml b/dev-tools/ansible/inventories/scigap/develop-js2/group_vars/django/vars.yml
deleted file mode 100644
index 60351ff8cc..0000000000
--- a/dev-tools/ansible/inventories/scigap/develop-js2/group_vars/django/vars.yml
+++ /dev/null
@@ -1,52 +0,0 @@
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
----
-user: "pga"
-group: "pga"
-gateway_data_store_hostname: "web.dev.scigap.org"
-django_gateway_user_storages:
- - alias: "default"
- storage_resource_id: "web.dev.scigap.org_ba01452f-44e5-4e03-b35f-756630539198"
- options:
- directory: "{{ experiment_data_dir }}"
- - alias: "pgadev"
- storage_resource_id: "pgadev.scigap.org_7ddf28fd-d503-4ff8-bbc5-3279a7c3b99e"
- options:
- directory: "{{ experiment_data_dir }}"
-django_wsgi_processes: 1
-doc_root_dir: "/var/www/portals/django-{{gateway_id}}"
-django_database_name: "django_{{ gateway_id }}"
-django_hidden_airavata_apps: "['django_airavata_dataparsers']"
-tusd_vhost_servername: "tus.dev.scigap.org"
-tusd_upload_dir: "{{real_user_data_dir}}/tus-temp-dir"
-airavata_django_git_branch: "develop"
-cilogon_userinfo_url: "https://cilogon.org/oauth2/userinfo"
-real_user_data_dir: "/media/volume/sdb/gateway-user-data"
-
-# Default email settings
-portal_email_host: "smtp.gmail.com"
-portal_email_port: 587
-portal_email_tls: true
-portal_email_username: "devdjango.portal@scigap.org"
-portal_email_password: "{{ vault_portal_email_password }}"
-portal_server_email: "{{ portal_email_username }}"
-admin_emails: "[('SGRC Group', 'sgrc-iu-group@iu.edu')]"
-django_error_emails: "[('Marcus Christie', 'machrist@iu.edu'), ('Eroma Abeysinghe', 'eabeysin@iu.edu')]"
diff --git a/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/amp/vars.yml b/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/amp/vars.yml
deleted file mode 100644
index c57e5c728f..0000000000
--- a/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/amp/vars.yml
+++ /dev/null
@@ -1,76 +0,0 @@
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
----
-real_user_data_dir: "/media/volume/sdb/gateway-user-data"
-# Keep user_data_dir same as it was on old VM
-user_data_dir: "/data/gateway-user-data"
-vhost_servername: "dev.ampgateway.org"
-# vhost_servername: "amos.js2.scigap.org"
-vhost_ssl: true
-
-# TODO: while developing django app, turn off SELinux, but turn it back on
-# once code execution issues are ironed out
-httpd_selinux_mode: "permissive"
-
-airavata_django_extra_dependencies:
- - name: "git+ssh://git@github.com/SciGaP/trecx-django-app.git#egg=trecx-django-app"
- editable: true
-
-# tus isn't setup yet
-tusd_vhost_servername:
-# sudo certbot --apache certonly -d django.simccs.scigap.org
-ssl_certificate_file: "/etc/letsencrypt/live/{{ vhost_servername }}/cert.pem"
-ssl_certificate_chain_file: "/etc/letsencrypt/live/{{ vhost_servername }}/fullchain.pem"
-ssl_certificate_key_file: "/etc/letsencrypt/live/{{ vhost_servername }}/privkey.pem"
-
-## Keycloak related variables
-tenant_domain: "amp"
-oauth_client_key: "{{ vault_oauth_client_key }}"
-oauth_client_secret: "{{ vault_oauth_client_secret }}"
-
-auth_options:
- password:
- name: "Dev AMP"
- external:
- - name: "Existing Institute Login"
- idp_alias: "cilogon"
-
-gateway_id: "amp"
-experiment_data_dir: "{{ user_data_dir }}/django-amp"
-gateway_data_store_resource_id: "dev.ampgateway.org_b8228bc7-fad2-45db-8ed1-47de359a54a5"
-gateway_data_store_hostname: "dev.ampgateway.org"
-
-django_gateway_user_storages:
- - alias: "default"
- storage_resource_id: "{{ gateway_data_store_resource_id }}"
- options:
- directory: "{{ experiment_data_dir }}"
-
-gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCMuKQoD6K1DpgHyoY2/eyLMNc5UdupqWqBFEnSO24izMXeOqTityLDRrVZGMLvV/t9wZEig1dhg21Ic5wRSHpCra2BXRn+WjgVdR20EGWPkuFYoDyeMyp8YKjaf1+Fcz+2H52wnrC0RFOHExgB3DWkRSEGghyyIXSBPMxrpS+f0FAfTc36i+EQq2UC0n1xvcdrtGjCKv56mafiKgFfYHbFw7Y7eJxhDCYlRYnzeTJBxWATu9tMGKZgGOxdDXR5hjTvqnpMpk3QpvY/BzAYpCIXxZbb7C41vHaGA9kabjuSlQG4nd+YAxiPrUZdExQNHUE9SCPFQMd/FxsNGdf7YCGH"
-
-django_error_emails: "[('Marcus Christie', 'machrist@iu.edu'), ('Eroma Abeysinghe', 'eabeysin@iu.edu'), ('Sudhakar Pamidighantam', 'pamidigs@iu.edu'), ('Dinuka De Silva', 'dinsdesi@iu.edu')]"
-
-portal_title: "Dev AMP Gateway"
-
-django_extra_settings:
- TRECX:
- TRECX_APPLICATION_ID: "tRecX_70fc89f8-424f-4495-99e3-f3aa6a75f967"
-...
diff --git a/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/amp/vault.yml b/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/amp/vault.yml
deleted file mode 100644
index 0ba8c59a6a..0000000000
--- a/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/amp/vault.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-62343264326564323230663837373532633264306334616664656532656636393761336436393638
-3066336565383831643837336465383633393461346331610a616439626234613633393131643264
-35656539646362393233343835373766613930326461663466323638313263663034386334333731
-3030313335616539360a396534626637633065326330646166646664623462303533373232373065
-63663138343636653233303735353739356430636463646336376465376562613937306366373136
-62653062646662393466663163316630326632323665313633653936373835373865643936386666
-65333135313337623962313132366632306231306331313531383530616534313532386133663262
-64393236643130636334616234373037663337343139663762306462336130656265376463613166
-36396433636564306230613535666139386336313062333630653837366362343033306365363764
-30643737376563663364393961376238316431313139633335346430643964626530663765333261
-343663303662646533666664663762306634
diff --git a/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/csbglsu/vars.yml b/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/csbglsu/vars.yml
deleted file mode 100644
index 0d26cccca1..0000000000
--- a/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/csbglsu/vars.yml
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
----
-#airavata_django_git_branch: "simccs"
-vhost_servername: "beta-sciencegateway.brylinski.org"
-vhost_ssl: true
-# sudo certbot --apache certonly -d django.simccs.scigap.org
-ssl_certificate_file: "/etc/letsencrypt/live/beta-sciencegateway.brylinski.org/cert.pem"
-ssl_certificate_chain_file: "/etc/letsencrypt/live/beta-sciencegateway.brylinski.org/fullchain.pem"
-ssl_certificate_key_file: "/etc/letsencrypt/live/beta-sciencegateway.brylinski.org/privkey.pem"
-
-## Keycloak related variables
-tenant_domain: "csbglsu"
-oauth_client_key: "{{ vault_oauth_client_key }}"
-oauth_client_secret: "{{ vault_oauth_client_secret }}"
-
-auth_options:
- password:
- name: "Computational Sys Biology Gateway"
- external:
- - name: "Existing Institute"
- idp_alias: "cilogon"
-
-gateway_id: "csbglsu"
-experiment_data_dir: "{{ user_data_dir }}/django-csbglsu"
-gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCFlFv/4KuHykIWcOEvTa64ELh9/qNsF6qf11IjrseYp/th8agceygIViFkwfRZzAPj+Vx11Ic+NXKI3aOZjtauUKl+R+iRTMFDX39deV5hyCHPBJTTw7wqltmH/lxJOU0nMaAnQlXmNu+zHEmz0hhkfKn6sQdYFRMb6eDWtZwJqGHzIrZNOs+wxhJ7FBWQ+yDx8akutKEXX5Zka9fnTgOfoWP+ch262uzI/eeJgwuzlu0iFb7IKdHZm3FJEsUaz0W+u+mKY9uxktW16KW4xS2ox7smVUOyuZgxAwThSQjPe2kVZxJNgbN/uSxuGy0pOC+o+8Av/dK4qPI41A/4qKSv"
-
-portal_title: "LSU Computational Sys Biology"
-...
diff --git a/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/csbglsu/vault.yml b/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/csbglsu/vault.yml
deleted file mode 100644
index badad9844a..0000000000
--- a/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/csbglsu/vault.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-31373638663130386130363734303263353239336266613036386532396438613663373261666635
-6230373235653163646431346132363165346238383336320a633663323238363366626439303533
-66386631613661323736313330656564646235656632323536316263393265346135663964356438
-6134323139636339610a396465373939616565333965616665643966663830663035656165336263
-32613735343264656165353461666564303865386437326462353162633263653834303164396261
-36616634613662373165373934326337353437643931623461386564333462663736383464666138
-38333539356139363738386163613664393434633031343637353237666637323835643462363535
-33363965353138613461336230366132646631646134323536386338353833383766643664366132
-30653934323538646135326462656334376535393939333637396533643866363666636463393464
-30616161333165656137363464333537633035353330333830393961303562363065633235633436
-383238336137626439376135383937613337
diff --git a/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/custos-testdrive/vars.yml b/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/custos-testdrive/vars.yml
deleted file mode 100644
index 70af791b2f..0000000000
--- a/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/custos-testdrive/vars.yml
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
----
-#gateway_data_store_hostname: "delta-topology.jetstream-cloud.org"
-#gateway_data_store_resource_id: "delta-topology.jetstream-cloud.org_a272f087-f733-433c-a32c-745577ed6067"
-# tus isn't setup yet
-tusd_vhost_servername:
-
-# No symlink, user_data_dir is same as real_user_data_dir
-user_data_dir: "{{ real_user_data_dir }}"
-#airavata_django_git_branch: "simccs"
-vhost_servername: "custos.testdrive.scigap.org"
-vhost_ssl: true
-# sudo certbot --apache certonly -d django.simccs.scigap.org
-ssl_certificate_file: "/etc/letsencrypt/live/custos.testdrive.scigap.org/cert.pem"
-ssl_certificate_chain_file: "/etc/letsencrypt/live/custos.testdrive.scigap.org/fullchain.pem"
-ssl_certificate_key_file: "/etc/letsencrypt/live/custos.testdrive.scigap.org/privkey.pem"
-
-## Keycloak related variables
-tenant_domain: "custos-testdrive"
-oauth_client_key: "{{ vault_oauth_client_key }}"
-oauth_client_secret: "{{ vault_oauth_client_secret }}"
-
-auth_options:
- password:
- name: "Custos Testdrive"
-# external:
-# - name: "Existing Institute Login"
-# idp_alias: "cilogon"
-
-gateway_id: "custos-testdrive"
-experiment_data_dir: "{{ user_data_dir }}/django-custos-testdrive"
-# gateway_data_store_ssh_public_key: "TODO"
-
-admin_emails: "[('SGRC', 'circ-iu-group@iu.edu')]"
-portal_title: "Custos Testdrive Portal"
-
-...
diff --git a/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/custos-testdrive/vault.yml b/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/custos-testdrive/vault.yml
deleted file mode 100644
index c5652710c0..0000000000
--- a/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/custos-testdrive/vault.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-31613530626335633161633936396166633766353735346464626132616636343034623736333636
-3234376330316636326135303266353066383665383735620a353430643566616131646264356366
-30396262306665376362653439613337613861636266396338336562636261373061373737623264
-3239646262376137610a373939396631323534633935373431353166353531626665356565353335
-38343331316366326564343034306134346362313966316263386463636566373038303937373136
-62386538616164396135653733396431346162663837343739303366333361333739313738653636
-32386163366563363239626334323834636230303435383761643331316361363563343338663436
-61326132636662323736653037316638366266363138323837373533313737396135363464353134
-63383463383563323161613136663766343765316234643730393232656633393066303963653338
-65383164333730303239323161353533353230646261653037346530323264346661316164306662
-323638363033383462383332646531363264
diff --git a/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/cyberwater/vars.yml b/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/cyberwater/vars.yml
deleted file mode 100644
index a0f9d451ea..0000000000
--- a/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/cyberwater/vars.yml
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
----
-# vhost_servername: "cyberwater.scigap.org"
-vhost_servername: "cyberwater.js2.scigap.org"
-vhost_ssl: true
-ssl_certificate_file: "/etc/letsencrypt/live/{{ vhost_servername }}/cert.pem"
-ssl_certificate_chain_file: "/etc/letsencrypt/live/{{ vhost_servername }}/fullchain.pem"
-ssl_certificate_key_file: "/etc/letsencrypt/live/{{ vhost_servername }}/privkey.pem"
-
-## Keycloak related variables
-tenant_domain: "cyberwater"
-oauth_client_key: "{{ vault_oauth_client_key }}"
-oauth_client_secret: "{{ vault_oauth_client_secret }}"
-
-auth_options:
- password:
- name: "CyberWater"
- external:
- - name: "Existing Institute Login"
- idp_alias: "cilogon"
-
-gateway_id: "cyberwater"
-experiment_data_dir: "{{ user_data_dir }}/django-cyberwater"
-gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCgbggEQsHObu9N03L2mTOEwd6+U5w7j5VuYCkkbT8Cz/XNTDmdX/bNHlTlaWafm37mfmJznI6owl2XwoYWmV4etTs1OpPsffqDXkO7QUsDzvwWzWkqKjhkdD2e7pJ2dPdWrMQbDHdi7RnmapX4+JI042dqbJUd15xBgS0Jud/eVXGZsyeMDbGfMJ4m4ckV2ywSwvxAT5XFald5I25tdi7dwPA8g+hcIQNxRF+oBX5L+mepqTV5KNFQzmKFh1eREf8+yVkSU6NKLsZc2CSghquU58KKWtJbXEo9L31jcn0Jxxf3VjdchbLzAh3nVwoNhLfeYr5ox0YGpW6Xk3ROb14r"
-
-portal_title: "Beta Cyberwater Gateway"
-...
diff --git a/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/cyberwater/vault.yml b/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/cyberwater/vault.yml
deleted file mode 100644
index 06a2d4261a..0000000000
--- a/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/cyberwater/vault.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-38336537336435386532386632363938633665663334363538336262313761366162396130326262
-3365363363373431636330326230363732393464383061620a623438393830356333636661623134
-65616635633030336364346563353032613664356133396437323764306236653235323633636431
-3133653161393235650a636631396230323166346338653162636333383733636133363634333536
-66333939636134333663326138396334336266663731626466646432666430366539306338633336
-30613063326232313133396632323430623235356361663763356439366564623132633863656565
-66363934356562613462623231343338383230363036333230376262623431613464303264663663
-65636435303839383431656164623066646430663837383162346537366531636163623239663634
-64383531633336633138313261303436313131326137333563633531626664663033333661663933
-61326261633539313937626135376338646261316132393539646334326665613630386236663564
-363064386233646130663538303335343263
diff --git a/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/delta/vars.yml b/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/delta/vars.yml
deleted file mode 100644
index 48007e5bf1..0000000000
--- a/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/delta/vars.yml
+++ /dev/null
@@ -1,61 +0,0 @@
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
----
-# TODO: create a new gateway data store resource and update this (OR, maybe we can just update the hostname for the storage resource?)
-gateway_data_store_hostname: "delta-topology.jetstream-cloud.org"
-gateway_data_store_resource_id: "delta-topology.jetstream-cloud.org_a272f087-f733-433c-a32c-745577ed6067"
-# tus isn't setup yet
-tusd_vhost_servername:
-
-real_user_data_dir: "/media/volume/sdb/data/gateway-user-data"
-user_data_dir: "/data/gateway-user-data"
-# vhost_servername: "dev.delta-topology.org"
-vhost_servername: "dev.delta.js2.scigap.org"
-vhost_ssl: true
-ssl_certificate_file: "/etc/letsencrypt/live/{{ vhost_servername }}/cert.pem"
-ssl_certificate_chain_file: "/etc/letsencrypt/live/{{ vhost_servername }}/fullchain.pem"
-ssl_certificate_key_file: "/etc/letsencrypt/live/{{ vhost_servername }}/privkey.pem"
-
-## Keycloak related variables
-tenant_domain: "dev-delta"
-oauth_client_key: "{{ vault_oauth_client_key }}"
-oauth_client_secret: "{{ vault_oauth_client_secret }}"
-
-auth_options:
- password:
- name: "Dev DELTA"
-# external:
-# - name: "Existing Institute Login"
-# idp_alias: "cilogon"
-
-django_extra_settings:
- GATEWAY_DATA_SHARED_DIRECTORIES:
- shared_data:
- path: /data/gateway-user-data/shared_data
-
-gateway_id: "dev-delta"
-experiment_data_dir: "{{ user_data_dir }}/django-dev-delta"
-gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCls5UgazweDc9d4NN65D+JVCeiBUhMSHTRWNHI6v1RPq/Or84fF41+HaemToQverQ73b/gUiXWuGfb75Y7JK5sgqRXCUiL1OVHICX3h4sh8UiMHEe5fUY/PNme2+witXYFr8EkYrdseJgnKXNULsgZEkuHzYbDFrn6z+pc4zXtoT/iUic8lUmeR1h8Quac7G0cSS0X8CFDMjkBKoX3KU7wffwuLGO2IhIdNpBgKzQUWRm6vEA48wdjEQTneX9rQefASOsbp/HNJHN/xsovFTNdatnezKz1Dt8cpSl32KEFs1YQYB6UmGJimRWiAAQBNCcaHLlgXWIQQ2U0vbsrVKZr"
-
-admin_emails: "[('SGRC', 'circ-iu-group@iu.edu')]"
-portal_title: "Dev DELTA Gateway"
-
-...
diff --git a/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/delta/vault.yml b/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/delta/vault.yml
deleted file mode 100644
index cf2dc9af9a..0000000000
--- a/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/delta/vault.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-31653037356132313263353534323031356465623334633064636430343333636434396436383665
-6130643331393165363164623339333163306430373830350a643663383834613634626564623630
-36666664313936393165306531646538353564306266626138356631353261316236303466376139
-3863623139353434300a663133376661396338396634326338366430316461663566616539353037
-35616530316565356631303239336433333431363338326533373932366630313930663431626333
-37326134363131383030343331643064326237656463646338663933333263613837313530363863
-31343238626464353266343466643130326566393066663136313536393561386363343765386566
-32633837373430333038316566363830383338353365363064356364663039343536643939366131
-33663435323432336165316535393834303963353633633338653265323166316531613538303237
-37633164643363363632376363376332326364633064633935386366363933386437366335663831
-323963643930643236363863376464316265
diff --git a/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/geo/vars.yml b/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/geo/vars.yml
deleted file mode 100644
index d9d3622f54..0000000000
--- a/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/geo/vars.yml
+++ /dev/null
@@ -1,60 +0,0 @@
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
----
-
-airavata_django_extra_dependencies:
- - name: "git+https://github.com/GeoGateway/geogateway-django-app.git@ui-update#egg=geogateway_django_app"
-# - name: "git+https://github.com/GeoGateway/geogateway-django-app.git@master#egg=geogateway_django_app"
- editable: true
-
-#Git hook is not set for this gateway
-
-#airavata_django_git_branch: "simccs"
-# vhost_servername: "beta.geogateway.scigap.org"
-vhost_servername: "geogateway.js2.scigap.org"
-vhost_ssl: true
-# sudo certbot --apache certonly -d django.simccs.scigap.org
-ssl_certificate_file: "/etc/letsencrypt/live/{{ vhost_servername }}/cert.pem"
-ssl_certificate_chain_file: "/etc/letsencrypt/live/{{ vhost_servername }}/fullchain.pem"
-ssl_certificate_key_file: "/etc/letsencrypt/live/{{ vhost_servername }}/privkey.pem"
-
-django_extra_settings:
- LOGIN_REDIRECT_URL: "/geogateway_django_app/"
-
-## Keycloak related variables
-tenant_domain: "beta-geo"
-oauth_client_key: "{{ vault_oauth_client_key }}"
-oauth_client_secret: "{{ vault_oauth_client_secret }}"
-
-auth_options:
- password:
- name: "Beta GEO"
- external:
- - name: "Existing Institute Login"
- idp_alias: "cilogon"
-
-gateway_id: "beta-geo"
-experiment_data_dir: "{{ user_data_dir }}/django-geo"
-# gateway_data_store_ssh_public_key: "TODO"
-
-admin_emails: "[('SGRC', 'sgg@iu.edu')]"
-portal_title: "Beta GEO Gateway"
-...
diff --git a/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/geo/vault.yml b/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/geo/vault.yml
deleted file mode 100644
index eae52ff8cd..0000000000
--- a/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/geo/vault.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-61356465636564633862643661373632373161393436643932313536326434303136633133323530
-3632323832393335313162356263386231383335383139640a373335626539393133333136323637
-33613431366530313862623836366266623539356566623933633637323433366133333863316637
-6362363437373236360a313962383762333731663933336666303066356230613138333539376438
-66333763336439613934313164356437646630623735346338646236356331383166323336333035
-65633538343439633130313332643366393863643861363663656430333364316664363230336638
-66383036363434633736343530636161323639316238663865366434653934396438303663616563
-34383635613636633462323338393831336634323938616534633630663234373330316336313837
-66643433643932373132383363393261396639623231356630333739373733633138663037363434
-33613139636461386435626362633565346436643435653464326632333266346463353235393364
-306237356139393639623639356130373435
diff --git a/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/interactwel/vars.yml b/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/interactwel/vars.yml
deleted file mode 100644
index 57d015ef22..0000000000
--- a/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/interactwel/vars.yml
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
----
-vhost_servername: "interactwel.org"
-vhost_ssl: true
-ssl_certificate_file: "/etc/letsencrypt/live/{{ vhost_servername }}/cert.pem"
-ssl_certificate_chain_file: "/etc/letsencrypt/live/{{ vhost_servername }}/fullchain.pem"
-ssl_certificate_key_file: "/etc/letsencrypt/live/{{ vhost_servername }}/privkey.pem"
-
-interactwel_django_app_branch: "api-integration"
-# Disable installing the interactwel app until we can fix the install
-# airavata_django_extra_dependencies:
-# - name: git+https://github.com/InterACTWEL/interactactwel-django-app.git@{{ interactwel_django_app_branch }}#egg=interactwel-django-app
-# editable: true
-
-django_extra_settings:
- LOGIN_REDIRECT_URL: "/interactwel/"
-
-## Keycloak related variables
-tenant_domain: "interactwel"
-oauth_client_key: "{{ vault_oauth_client_key }}"
-oauth_client_secret: "{{ vault_oauth_client_secret }}"
-
-auth_options:
- password:
- name: "InterACTWEL"
- external:
- - name: "CILogon"
- idp_alias: "cilogon"
-
-gateway_id: "interactwel"
-experiment_data_dir: "{{ user_data_dir }}/django-interactwel"
-gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCK+P6aQeRRIUcm2oocxfCyHO9Kl9npX+Fc5f7jaEFgN3SfyYjah69yxvhVAWguRgXIG9xuKvzXmoSeNT0Yk1NoBTFHAtSUDy0KqIXkp5XK2Ocv/W2fblCx8v46amiv5VZToq+YK+P+XfmyfjNEv9WXo9vtIfj2RQlVk3g+GIcCQgkiIxl4XEh7+AknahqWEkzlGeqTBHtwyRXbhuvLf6M4vNoUhxn4aY8DOcJPZF1jnWB+ZiTiNBXRA7Hx/L78RWoHTf50KOO3LQ+AD7727kdIYWM4wVgRzY8pac5bIJ7ncyp//2GiUzSoXSbLV2vZDMz9CM0Ovfpg6P6Q2j5inS0J"
-# Show the Data Parsers app option for Interactwel
-django_hidden_airavata_apps: "[]"
-
-portal_title: "InterACTWEL Gateway"
-...
diff --git a/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/interactwel/vault.yml b/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/interactwel/vault.yml
deleted file mode 100644
index 5d6d86f63c..0000000000
--- a/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/interactwel/vault.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-39613839636263333166306433313461616164363966663636653939356235363536366136663766
-3863653431303038383933393035616330643839663135380a353866663834396264313331333730
-33393539613135363239376334313033323338633366393266333536306663383661336338653036
-6533356430326166300a376130343737393339636638333033383835313333633961636662383764
-65646130346235633734336131323237343938666139613530626235333964323434326532323639
-36633633343361633133353864653435323563333865316137313539333438663935333461353430
-65653239643230313463393239333263346664326461303439646638343261656437656537353665
-36366530613538306163396232306533386161303136386535653335386166356234303263306161
-30636539336439376632323561663366323765333739653132633836306537313430616561363665
-35623238633236353533316461353530323139393636663163343736666365363739653934373938
-623263373937633464336631373237356364
diff --git a/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/mines/vars.yml b/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/mines/vars.yml
deleted file mode 100644
index 3a548a03a5..0000000000
--- a/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/mines/vars.yml
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
----
-#airavata_django_git_branch: "simccs"
-vhost_servername: "django.mines.scigap.org"
-vhost_ssl: true
-# sudo certbot --apache certonly -d django.simccs.scigap.org
-ssl_certificate_file: "/etc/letsencrypt/live/django.mines.scigap.org/cert.pem"
-ssl_certificate_chain_file: "/etc/letsencrypt/live/django.mines.scigap.org/fullchain.pem"
-ssl_certificate_key_file: "/etc/letsencrypt/live/django.mines.scigap.org/privkey.pem"
-
-## Keycloak related variables
-tenant_domain: "mines"
-oauth_client_key: "{{ vault_oauth_client_key }}"
-oauth_client_secret: "{{ vault_oauth_client_secret }}"
-
-auth_options:
- password:
- name: "Mines"
-# external:
-# - name: "Existing Institute Login"
-# idp_alias: "cilogon"
-
-gateway_id: "mines"
-experiment_data_dir: "{{ user_data_dir }}/django-mines"
-# gateway_data_store_ssh_public_key: "TODO"
-
-admin_emails: "[('SGRC', 'sgrc-iu-group@iu.edu'), ('Matthew T Jones','matjones@mymail.mines.edu')]"
-portal_title: "Mines Gateway"
-...
diff --git a/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/mines/vault.yml b/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/mines/vault.yml
deleted file mode 100644
index 69982fc8f9..0000000000
--- a/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/mines/vault.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-35363261663563643366386135396661353563383632313062353866333835316439616337633366
-6233333033656135373631623331663535396339623834610a633930656463383261653336303735
-64633538366531633333353661373435343561313033643733303331383838363166313265316134
-3665323633633136320a333232303165356538626364346262326662333566396533343333623935
-63343430323766666137613335663462393166663033383235343532623636623231373964333130
-34396131313637613238373666633438373034306434636533646364333165343538666236356263
-31366532666566623935393337643538326233646663346266633134333837643931393963343930
-62326361356132666433386533393033313736373032303761666236623131356430626137346464
-65633338643666363264626438643966616336623934326330653766393936376636343865383864
-30336335353239373933616162313361313331306433313830643061643730363431653164626436
-353064363864643636643437666138313133
diff --git a/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/nexttdb/vars.yml b/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/nexttdb/vars.yml
deleted file mode 100644
index b4352340b7..0000000000
--- a/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/nexttdb/vars.yml
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
----
-#airavata_django_git_branch: "simccs"
-vhost_servername: "nexttdb.sciencegateway.scigap.org"
-vhost_ssl: true
-# sudo certbot --apache certonly -d django.simccs.scigap.org
-ssl_certificate_file: "/etc/letsencrypt/live/nexttdb.sciencegateway.scigap.org/cert.pem"
-ssl_certificate_chain_file: "/etc/letsencrypt/live/nexttdb.sciencegateway.scigap.org/fullchain.pem"
-ssl_certificate_key_file: "/etc/letsencrypt/live/nexttdb.sciencegateway.scigap.org/privkey.pem"
-
-## Keycloak related variables
-tenant_domain: "nexttdb"
-oauth_client_key: "{{ vault_oauth_client_key }}"
-oauth_client_secret: "{{ vault_oauth_client_secret }}"
-
-auth_options:
- password:
- name: "Next Generation Thermodynamics Gateway"
- external:
- - name: "Existing Institute"
- idp_alias: "cilogon"
-
-gateway_id: "nexttdb"
-experiment_data_dir: "{{ user_data_dir }}/django-nexttdb"
-# gateway_data_store_ssh_public_key: "TODO"
-
-portal_title: "Next Generation Thermodynamics"
-...
diff --git a/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/nexttdb/vault.yml b/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/nexttdb/vault.yml
deleted file mode 100644
index ff6d3485a0..0000000000
--- a/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/nexttdb/vault.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-66316130346363653762646661643938653839613238666637376139643233636361303265376631
-6135323363616161636339326232616465643634383835610a336236393362393661666236303630
-35323537333736316439356235663538346331393863323836393264353636613861626332343734
-3335333861343938360a373761666631383933666634316665613130346461653566346230623961
-32313338613030383630376336393030396336623066633465653537623436373762313336363032
-65316135643333366230323139333239616461623039363361653836303832306462396363626432
-32373433383762636232653861636333373261366666663563393362383635336561373531303761
-37313062383630323431346162653633353230313338613662623163306261393431363530336162
-37356166333861316661376235386531323236653266356662316636613235646433343361333662
-64343533316633323734646230663236633930326335613334383966666338353131396630363430
-623665333034643837636339616162363734
diff --git a/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/pfec-hydro/vars.yml b/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/pfec-hydro/vars.yml
deleted file mode 100644
index 26614f25ca..0000000000
--- a/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/pfec-hydro/vars.yml
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
----
-#airavata_django_git_branch: "simccs"
-vhost_servername: "pfec-hydro.scigap.org"
-vhost_ssl: true
-# sudo certbot --apache certonly -d django.simccs.scigap.org
-ssl_certificate_file: "/etc/letsencrypt/live/pfec-hydro.scigap.org/cert.pem"
-ssl_certificate_chain_file: "/etc/letsencrypt/live/pfec-hydro.scigap.org/fullchain.pem"
-ssl_certificate_key_file: "/etc/letsencrypt/live/pfec-hydro.scigap.org/privkey.pem"
-
-## Keycloak related variables
-tenant_domain: "pfec-hydro"
-oauth_client_key: "{{ vault_oauth_client_key }}"
-oauth_client_secret: "{{ vault_oauth_client_secret }}"
-
-auth_options:
- password:
- name: "PfEC-Hydro"
- external:
- - name: "Existing Institute Login"
- idp_alias: "cilogon"
-
-gateway_id: "pfec-hydro"
-experiment_data_dir: "{{ user_data_dir }}/django-pfec-hydro"
-gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCVUiDweafreHh7nN4vabpG0wHrlyYCAObDtjmjP9hist848Y25BP+Rdq+64xHlKmJ1CDDZmjmb9T6JI5JhzYvg0RoD2WxDFcV10y7wamzT7b5TjGK/x11Qwh68qNfAi5amePvkL5oE/HCG95oKityG24EUt3yNOttOLYFnbdnlUXQiDkk1xT/8mbtAPXKnhjopYebwjsK7tYBzGe6YIU0teMA2goWl/6WjTWQBikhSOR1P074qEKzrvqt5mQqVi1HDpHKPP+JA/6upJu2THPNqUw2XuzkwFLkPAjUlnj2NugKTdUZco3lRc2lyjb2OEGuFO6I41WB/xnbBhQOXqDJX"
-
-portal_title: "Beta Future Water Gateway"
-...
diff --git a/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/pfec-hydro/vault.yml b/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/pfec-hydro/vault.yml
deleted file mode 100644
index 68c7e5f58e..0000000000
--- a/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/pfec-hydro/vault.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-31343631303938373564643839356435306632656333656366636234313030393739333061383566
-3666303032303234323234623462646234616235616630300a623636383363643166616335343164
-33666264323735326666646661356662353934613434316138643131613937393231643939313637
-3436653661323766370a623363643530623935616364386265636130363235616263646637653066
-34303536663539653338373936306336373234386434363733626661623834646664356637313831
-63663566366563373762656338613334303639346630653563373835666330306366356338636563
-30383637653339363130343032643664356139326438303938653662306162303161346633373561
-38616634373837376266303766656566323034363966646133666135633831306537386338386662
-36383465323735333438303633313235383062646261376631383930616363623835323936383137
-36363537643735636265666230333833623535616462653839353165313239323135616363316534
-353634643930626263346130626233646165
diff --git a/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/rnamake/vars.yml b/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/rnamake/vars.yml
deleted file mode 100644
index 689b738514..0000000000
--- a/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/rnamake/vars.yml
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
----
-vhost_servername: "rnamake.js2.scigap.org"
-vhost_ssl: true
-ssl_certificate_file: "/etc/letsencrypt/live/{{ vhost_servername }}/cert.pem"
-ssl_certificate_chain_file: "/etc/letsencrypt/live/{{ vhost_servername }}/fullchain.pem"
-ssl_certificate_key_file: "/etc/letsencrypt/live/{{ vhost_servername }}/privkey.pem"
-
-## Keycloak related variables
-tenant_domain: "rnamake"
-oauth_client_key: "{{ vault_oauth_client_key }}"
-oauth_client_secret: "{{ vault_oauth_client_secret }}"
-
-auth_options:
- password:
- name: "RNAMake"
- external:
- - name: "Existing Institute Login"
- idp_alias: "cilogon"
-
-gateway_id: "rnamake"
-experiment_data_dir: "{{ user_data_dir }}/django-rnamake"
-# gateway_data_store_ssh_public_key: "TODO"
-
-admin_emails: "[('SGRC', 'sgrc-iu-group@iu.edu')]"
-portal_title: "Dev RNAMake Gateway"
-...
diff --git a/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/rnamake/vault.yml b/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/rnamake/vault.yml
deleted file mode 100644
index a98858350e..0000000000
--- a/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/rnamake/vault.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-33396464353636353931363663653635306535333236313130316263643333303936663966663433
-3636616463356463626161323732343338336537323665620a653363633230386336653764663635
-61306539303433393138376162346562306632636230343261313837333235353936636635373165
-3166313038303034650a613336383631313338643065383439353132383061303333383034626338
-32336366613738326530626565356665333735636637396336346134396566643137323234326233
-36626231373631383938326439343262656534383533396236323332313435333633386162666263
-66313530393764386630323138333339633333646633383430316333616633363262643565353739
-61346363386431656235343061303734653535323632346634633031373437356364616231323463
-35333030666539633633386335303731393538303332393738613232373434613663313430623965
-34303632356466326132323831326363383164663633623535656334323765306261643030626236
-306665373938613165356361363663633638
diff --git a/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/saver-x/vars.yml b/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/saver-x/vars.yml
deleted file mode 100644
index dd3c8ee62f..0000000000
--- a/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/saver-x/vars.yml
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
----
-#airavata_django_git_branch: "simccs"
-vhost_servername: "beta.saver-x.scigap.org"
-vhost_ssl: true
-# sudo certbot --apache certonly -d django.simccs.scigap.org
-ssl_certificate_file: "/etc/letsencrypt/live/beta.saver-x.scigap.org/cert.pem"
-ssl_certificate_chain_file: "/etc/letsencrypt/live/beta.saver-x.scigap.org/fullchain.pem"
-ssl_certificate_key_file: "/etc/letsencrypt/live/beta.saver-x.scigap.org/privkey.pem"
-
-## Keycloak related variables
-tenant_domain: "saver-x"
-oauth_client_key: "{{ vault_oauth_client_key }}"
-oauth_client_secret: "{{ vault_oauth_client_secret }}"
-
-auth_options:
- password:
- name: "Saver-X"
- external:
- - name: "Existing Institute Login"
- idp_alias: "cilogon"
-
-gateway_id: "saver-x"
-experiment_data_dir: "{{ user_data_dir }}/django-saver-x"
-gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCXm3BdHBlCa4xX2dgq5NNONElxAla4ijczVnEG+NtxMM6H6joasxAUAlhAKZ4752T8bYGMopKELVKWzhiNELgsOitQcXODh27eAbQ0/DXDy9EEMYYTLzEzj89lpaHjh1HK1BrVCtfhnmHDr7nczQ2ywHroaKKTXfMt8AA0XqUF68bcVxAiqD2LiEFlSOq3ebLpqcD0188gWKT1T1BG1xhiUO+8XyDAdBnFqudGAkvQeTDhODSkVuD+kWZwj6/bfI9YHMqr8hXA6HpRrIrPr3hE6BUYci8y8gmfyJ9oLTo+0gMFzer8K/BMVU+bKZwSTtUZ0Xbr7wf28OH4wuzrhQd3"
-
-portal_title: "Saver-X Gateway"
-...
diff --git a/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/saver-x/vault.yml b/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/saver-x/vault.yml
deleted file mode 100644
index 2b6b68233d..0000000000
--- a/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/saver-x/vault.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-37666463386433636364363830646561353537613365343662363230343165336434633936323736
-3761386466643632326438393834333136636537303731630a613962386564313439663966306530
-63663066356337323339383131376335653331343530353337616534343537313261633731343731
-6332393430376261640a636436656331366133353432613634303964646261303635353263366665
-39376235343664343936396661323964363232313566646635353263393537353865643464366164
-65636330393839636436356665323736383565363038396533326138623638623538333234653665
-62663864623338303264346232366564393061393130326261333136306138363761363830653132
-36663435363363666638623037323566336265623663653336326531306332393535616537393433
-36623564363039306465383163653565653362353031663165393964336165366163653635613034
-37363766366662626333343462376165313063633765626666653134646431356436353134376434
-356533356365373264646537623765636333
diff --git a/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/seagrid/vars.yml b/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/seagrid/vars.yml
deleted file mode 100644
index 20936fdbad..0000000000
--- a/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/seagrid/vars.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
----
-vhost_servername: "js2.seagrid.org"
-vhost_ssl: true
-ssl_certificate_file: "/etc/letsencrypt/live/{{ vhost_servername }}/cert.pem"
-ssl_certificate_chain_file: "/etc/letsencrypt/live/{{ vhost_servername }}/fullchain.pem"
-ssl_certificate_key_file: "/etc/letsencrypt/live/{{ vhost_servername }}/privkey.pem"
-
-## Keycloak related variables
-tenant_domain: "seagrid"
-oauth_client_key: "{{ vault_oauth_client_key }}"
-oauth_client_secret: "{{ vault_oauth_client_secret }}"
-
-auth_options:
- password:
- name: "SEAGrid"
- external:
- - name: "CILogon"
- idp_alias: "oidc"
- idp_token_url: "{{ oauth_service_url }}/realms/{{ tenant_domain }}/broker/oidc/token"
- userinfo_url: "{{ cilogon_userinfo_url }}"
-
-gateway_id: "seagrid"
-experiment_data_dir: "{{ user_data_dir }}/django-seagrid"
-gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCFgLWSw6Mf0tPbkeSyzPMxgT50cNEXFDiE9UnEx0tIm+is9C3hIK78Ct8NAWgPxdXy1vd/9NBVIqkR516NZ7VyGbUHkrtPLOYL+Of9IyvxOQmrLzTLQNS9yVkxwxykJzBePZySyLcOKQdG8YoNj6+2iRolzfo5/w4Gz+MSqKmPJcVH8hjwTdoE5s0hYU4MaLF966hh6LUH7SG31BcTadtEgnE8nYfxeoa20oj0h0n1LKO06OZgVXVN3iulHimQ1paQiW71X9UPUhgpLnYAiI99BmYOQqEM4IndwZLZPwDeb23A0Dh3bLO8CAPgPRcG5b1Da6kABi5i5gcIt3WCJzeP"
-
-admin_emails: "[('CIRC', 'circ-iu-group@iu.edu'), ('Sudhakar Pamidighantam', 'pamidigs@iu.edu'), ('Eroma Abeysinghe', 'eroma.abeysinghe@gmail.com')]"
-portal_title: "SEAGrid Portal"
-
-...
diff --git a/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/seagrid/vault.yml b/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/seagrid/vault.yml
deleted file mode 100644
index 75cc2a588b..0000000000
--- a/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/seagrid/vault.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-36366565666433336663626538613763383233336439316438313934643863356637393931343731
-3861633463306432633930376631643961633665666238660a633336623863616164666232633335
-32353237626364373930326264633366343131653334613166343231663665363662636265623164
-3965363737616535320a623733623664343261303866613031653262343861363631343236373336
-39633535386665363832373165376164643639623333323965363238326636386336656365383634
-33383639623662373335346130663761393239333335646665353933393961643263366435643139
-61346661396134356365633433663138663139366463306461613363353866353736366662343733
-65326233373331383864633837376265323639353335356637303861383031373862306562303938
-33346531346530656631366130623832616366336231633131393564656131396661353137353364
-35326535666664326536623134636638376161393066373632656438656633663833643435646365
-343339363830616536666436653637303561
diff --git a/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/simccs/files/django-ssl-vhost.conf.j2 b/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/simccs/files/django-ssl-vhost.conf.j2
deleted file mode 100644
index 2e482d25b2..0000000000
--- a/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/simccs/files/django-ssl-vhost.conf.j2
+++ /dev/null
@@ -1,94 +0,0 @@
-{#
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#}
-
-{% if vhost_server_redirect is defined %}
-<VirtualHost *:{{httpd_default_http_port}}>
- ServerName {{ vhost_server_redirect }}
- Redirect "/" "https://{{ vhost_servername }}"
-</VirtualHost>
-{% endif %}
-
-<VirtualHost *:{{ httpd_default_http_port }}>
- ServerName {{ vhost_servername }}
-
- ## Redirect all http traffic to https
- RewriteEngine On
- RewriteCond %{HTTPS} off
- RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI}
-</VirtualHost>
-
-<VirtualHost *:{{ httpd_default_https_port }}>
- ServerName {{ vhost_servername }}
- TimeOut {{ vhost_timeout }}
-
- # Reverse proxy to geoserver on gf8
- ProxyPass /geoserver "http://gf8.ucs.indiana.edu/geoserver"
- ProxyPassReverse /geoserver "http://gf8.ucs.indiana.edu/geoserver"
-
- Alias /robots.txt {{ doc_root_dir }}/static/robots.txt
- Alias /favicon.ico {{ doc_root_dir }}/static/favicon.ico
-
- Alias /static/ {{ doc_root_dir }}/static/
-
- <Directory {{ doc_root_dir }}/static>
- Require all granted
- AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css text/javascript application/javascript
- </Directory>
-
- Alias /media/ {{ airavata_django_checkout }}/django_airavata/media/
-
- <Directory {{ airavata_django_checkout }}/django_airavata/media>
- Require all granted
- </Directory>
-
- {# Additional aliases #}
- {% for alias in vhost_aliases %}
- Alias "{{ alias.url }}" "{{ alias.path }}"
- <Directory "{{ alias.path }}">
- Require all granted
- </Directory>
- {% endfor %}
-
- WSGIDaemonProcess {{ vhost_servername }} display-name=%{GROUP} python-home={{ doc_root_dir }}/venv python-path={{ doc_root_dir }}/airavata-django-portal processes={{ django_wsgi_processes }} user={{ user }} group={{ group }}
- WSGIProcessGroup {{ vhost_servername }}
-
- WSGIScriptAlias / {{ doc_root_dir }}/airavata-django-portal/django_airavata/wsgi.py
- WSGIApplicationGroup %{GLOBAL}
- # To allow bearer token based authorization, pass 'Authorization' through to Django process
- WSGIPassAuthorization On
-
- <Directory {{ doc_root_dir }}/airavata-django-portal/django_airavata>
- <Files wsgi.py>
- Require all granted
- </Files>
- </Directory>
-
- ErrorLog {{ httpd_log_dir[ansible_os_family] }}/django-{{ gateway_id }}.error.log
- CustomLog {{ httpd_log_dir[ansible_os_family] }}/django-{{ gateway_id }}.requests.log combined
-
- SSLEngine on
- # Disable SSLv3 which is vulnerable to the POODLE attack
- SSLProtocol All -SSLv2 -SSLv3
- SSLCertificateFile {{ ssl_certificate_file }}
- SSLCertificateChainFile {{ ssl_certificate_chain_file }}
- SSLCertificateKeyFile {{ ssl_certificate_key_file }}
-</VirtualHost>
diff --git a/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/simccs/vars.yml b/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/simccs/vars.yml
deleted file mode 100644
index 6ebcd9123c..0000000000
--- a/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/simccs/vars.yml
+++ /dev/null
@@ -1,71 +0,0 @@
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
----
-# simccs_maptool_branch: "issue-50-Use-national-cost-surface-for-from-scratch-scenarios"
-simccs_maptool_branch: "dev"
-airavata_django_extra_dependencies:
- # Need to separately install cython in the VM or do two deploys, one with
- # just cython, then a second with the other dependencies. Reason: pyjnius
- # requires that cython already be installed and they can't both be installed
- # at the same time.
- - name: cython
- - name: "git+https://github.com/SciGaP/simccs-maptool.git@{{ simccs_maptool_branch }}#egg=simccs-maptool"
- editable: true
- - name: pyjnius
-# vhost_servername: "beta.simccs.org"
-# Temporary use a *.scigap.org domain name
-# Some of the maptool views call into Java code and can take 2-3 minutes to execute
-vhost_timeout: 300
-vhost_servername: "simccs.js2.scigap.org"
-vhost_ssl: true
-ssl_certificate_file: "/etc/letsencrypt/live/{{ vhost_servername }}/cert.pem"
-ssl_certificate_chain_file: "/etc/letsencrypt/live/{{ vhost_servername }}/fullchain.pem"
-ssl_certificate_key_file: "/etc/letsencrypt/live/{{ vhost_servername }}/privkey.pem"
-# Custom vhost config file to specify the geoserver reverse proxy
-django_ssl_vhost_template: "{{ inventory_dir }}/host_vars/simccs/files/django-ssl-vhost.conf.j2"
-
-## Keycloak related variables
-tenant_domain: "simccs"
-oauth_client_key: "{{ vault_oauth_client_key }}"
-oauth_client_secret: "{{ vault_oauth_client_secret }}"
-
-auth_options:
- password:
- name: "SimCCS"
- external:
- - name: "CILogon"
- idp_alias: "cilogon"
-
-django_extra_settings:
- JAVA_HOME: "/usr/java/default"
- MAPTOOL_SETTINGS:
- CPLEX_APPLICATION_ID: "Cplex_a7eaf483-ab92-4441-baeb-2f302ccb2919"
- DATASETS_DIR: "/data/gateway-user-data/simccs-datasets"
- JAVA_OPTIONS: "-Xmx13g"
- LOGIN_REDIRECT_URL: "simccs_maptool:home"
-
-gateway_id: "simccs"
-experiment_data_dir: "{{ user_data_dir }}/django-simccs"
-gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCuylY2GrNiS6ylc4a0qfnNHEUHq9kzCg4yrNmK6O5KTIDN8SdUvVQ9BMx1jPnc9WZEFhvGvUvY1vqM/X0NZ5CS2wXs0LYxucL8Qz1YTJ2p55p0+5ImsaxZa/R4JlAaNeI1IFuR3bgBkjH92KzJha8UFko18md7M72wio1w4Mwq2sCC0g9Iuni04uSSps4BL0hA/lopeRSwzIE0aRT6mVe+vZ73+LfA39e0jJLbcbyhhGUKqUu1YThKo5UIlaz6VMyr0L+NuR5ng21Fyp7C0vdGkOoxIBAX7NcuUnKD6P0rBG7QvzHYTxjGivyjFNE3vjTH40iiSPdQ7nw/+PKpo/C9"
-
-portal_title: "Indiana Geological Survey"
-
-...
diff --git a/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/simccs/vault.yml b/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/simccs/vault.yml
deleted file mode 100644
index 46a842bdfb..0000000000
--- a/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/simccs/vault.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-31643137386466393664666162306266313165383938333831653735626366393763613533353935
-3339663839613965353331653263373063366365616538300a343435313038356234356564353637
-32396232336531346430636166613361306134663737326135666238313237343338663431323662
-3735373034633866300a623638333133376332373163313434343131373464313663613566616632
-64666431356532363736313930326239613766373235376533343139643565623936313361326633
-35633363623464336432633930383264323465343935666432363865363138376532643563333635
-35643437653332383131383666313864626136396337373761353439386336313365623466303233
-36333665613434646133646362316164656631633235373461653535663230383331323534373163
-65623430363732333036383561303732666265326661663230613861343536656137656337653137
-31613434623437333539633534666664616233376338346635336662656138653731373063633830
-326637666366613165336566363436393031
diff --git a/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/simvascular/vars.yml b/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/simvascular/vars.yml
deleted file mode 100644
index 55efc2e892..0000000000
--- a/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/simvascular/vars.yml
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
----
-vhost_servername: "beta.gateway.simvascular.org"
-vhost_ssl: True
-ssl_certificate_file: "/etc/letsencrypt/live/beta.gateway.simvascular.org/cert.pem"
-ssl_certificate_chain_file: "/etc/letsencrypt/live/beta.gateway.simvascular.org/fullchain.pem"
-ssl_certificate_key_file: "/etc/letsencrypt/live/beta.gateway.simvascular.org/privkey.pem"
-
-## Keycloak related variables
-tenant_domain: "simvascular"
-oauth_client_key: "{{ vault_oauth_client_key }}"
-oauth_client_secret: "{{ vault_oauth_client_secret }}"
-
-auth_options:
- password:
- name: "Simvascular"
- external:
- - name: "CILogon"
- idp_alias: "cilogon"
-
-gateway_id: "simvascular"
-experiment_data_dir: "{{ user_data_dir }}/simvascular"
-# gateway_data_store_ssh_public_key: "TODO"
-
-portal_title: "Simvascular Gateway"
-
-...
diff --git a/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/simvascular/vault.yml b/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/simvascular/vault.yml
deleted file mode 100644
index ffe898d61a..0000000000
--- a/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/simvascular/vault.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-31366637633264633636663132323938343133386364386530373665656432313165323334623838
-3030383331383939313939366461656263333665643439310a323330303331626131373735613632
-65646631643232373366396635356134623834396338383333383234666135643561656435343934
-6130323038666633300a623562363736363733386138303836383439343531303966663039383537
-30396531313336373763326137323335613537623638626165666462333663343632636261653863
-34313933393331373865336638663163363831633835343265623938356537643236663038636337
-66643336643161306535633239363335663464666238613765616131653265303164383963316331
-32313662666138336263666663656334363665646264336439373764353039636166353533313832
-33613031663439626631613034313566313035646664313632323966316231333931383035303336
-34643261356137363236636563656166616365613339623238626530653335663465386637376135
-313033333164393533396339623163303836
diff --git a/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/usd/vars.yml b/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/usd/vars.yml
deleted file mode 100644
index 4dbc8f16e5..0000000000
--- a/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/usd/vars.yml
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
----
-#airavata_django_git_branch: "simccs"
-vhost_servername: "beta.sciencegateway.usd.edu"
-vhost_ssl: true
-ssl_certificate_file: "/etc/pki/tls/certs/__sciencegateway_usd_edu_cert.cer"
-ssl_certificate_chain_file: "/etc/pki/tls/certs/__sciencegateway_usd_edu_interm.cer"
-ssl_certificate_key_file: "/etc/pki/tls/private/usd.key"
-
-## Keycloak related variables
-tenant_domain: "usd"
-oauth_client_key: "{{ vault_oauth_client_key }}"
-oauth_client_secret: "{{ vault_oauth_client_secret }}"
-
-auth_options:
- password:
- name: "USD Gateway"
- external:
- - name: "USD"
- idp_alias: "usd"
- - name: "CILogon"
- idp_alias: "cilogon"
-
-gateway_id: "usd"
-experiment_data_dir: "{{ user_data_dir }}/django-usd"
-gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCddtn5FW08tc1anCFYYzD/DqyCFL4prZ0dU+wWBnoxMQOV5vM6yZUKAErmWQOInWQeMDXvznsmyeTcg04FjE+t7xV0NeJ3YEpeayxObOF4oSHTmUAaM+taF+7dSXT+SUgwVOsYaOkCJRVNqkpu1KireN6L2y53j4tmXQTCWgWOQre3a2hLVFqI6JDVVj3Cquq0muSK8wdaYSrwBMwqQ0eJCGPvyhrMNJ/YmADS6GaztZOc+YJGC1jEeKNdrSPV5a8pbHgjZsqjRDDLAeCS5d0kK17P79LUX/Ui1m8wq7HgzWULZPh8zoUYPKjgVjHndB5e6nKsWgLgTyI64Gmy4ETp"
-
-portal_title: "South Dakota Science Gateway"
-...
diff --git a/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/usd/vault.yml b/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/usd/vault.yml
deleted file mode 100644
index 05cba29ad8..0000000000
--- a/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/usd/vault.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-39383033633431393464326236333536623566376466343731396439666237346132653265316236
-3961663334393862346664353930386266336435653438300a363735316662643264386139666238
-39323436333731636535333066613437366538396630353131353862396332376362373961636336
-3162613430353565310a636266663330393939636137383935333436613135646630306235373134
-38376663633433363461616162313637636131353838313463633337316631383434316261303733
-65626639333131306662656162336565646632326434336337633336353537356633653730393164
-65303163376266613636663137363036643831623036306462343739333335643231346565383437
-37353761386336376263353032326364646336303339396239376438373336373765353363623930
-31623834613061303831313531663036666131613532626161623538663561343461313737356532
-62636536663462643133326566383233326538373335656630346234613732386531333664313033
-393132336134633138323462643535633939
diff --git a/dev-tools/ansible/inventories/scigap/develop-js2/hosts b/dev-tools/ansible/inventories/scigap/develop-js2/hosts
deleted file mode 100644
index 1c277b3aba..0000000000
--- a/dev-tools/ansible/inventories/scigap/develop-js2/hosts
+++ /dev/null
@@ -1,43 +0,0 @@
-# inventory file : scigap js2 develop deployment
-
-[zookeeper]
-helix.js2.scigap.org ansible_python_interpreter=/usr/bin/python3
-
-[rabbitmq]
-api.js2.scigap.org ansible_python_interpreter=/usr/bin/python3
-
-[database]
-db.js2.scigap.org ansible_python_interpreter=/usr/bin/python3
-
-[api-orch]
-api.js2.scigap.org ansible_python_interpreter=/usr/bin/python3
-
-[keycloak]
-iamdev.scigap.org ansible_python_interpreter=/usr/bin/python3 public_ipv4=149.165.152.23
-
-[helix]
-helix.js2.scigap.org ansible_python_interpreter=/usr/bin/python3
-
-[kafka]
-helix.js2.scigap.org ansible_python_interpreter=/usr/bin/python3
-
-[django]
-seagrid ansible_host=web.dev.scigap.org
-; simvascular ansible_host=149.165.156.46
-simccs ansible_host=web.dev.scigap.org
-interactwel ansible_host=web.dev.scigap.org
-; usd ansible_host=149.165.156.46
-; csbglsu ansible_host=149.165.156.46
-; nexttdb ansible_host=149.165.156.46
-; saver-x ansible_host=149.165.156.46
-; pfec-hydro ansible_host=149.165.156.46
-cyberwater ansible_host=web.dev.scigap.org
-; mines ansible_host=149.165.156.46
-amp ansible_host=149.165.153.222
-geo ansible_host=web.dev.scigap.org
-delta ansible_host=149.165.153.181
-; custos-testdrive ansible_host=pgadev.scigap.org
-rnamake ansible_host=web.dev.scigap.org
-
-[pga]
-scigap ansible_host=149.165.155.229
diff --git a/dev-tools/ansible/inventories/scigap/develop/group_vars/all/vars.yml b/dev-tools/ansible/inventories/scigap/develop/group_vars/all/vars.yml
index 5f1a36c285..53ac27809a 100644
--- a/dev-tools/ansible/inventories/scigap/develop/group_vars/all/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/develop/group_vars/all/vars.yml
@@ -20,7 +20,7 @@
---
ansible_connection: ssh
-ansible_user: centos
+ansible_user: exouser
user: airavata
group: airavata
@@ -146,6 +146,9 @@ keycloak_master_account_username: "admin"
keycloak_master_account_password: "{{ vault_keycloak_master_account_password }}"
keycloak_vhost_servername: "iamdev.scigap.org"
+# Letsencrypt
+letsencrypt_email: "circ-iu-group@iu.edu"
+
# Helix
helix_version: 0.9.9
helix_url: https://downloads.apache.org/helix/{{helix_version}}/binaries/helix-core-{{helix_version}}-pkg.tar
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 b5e9ba4f0f..60351ff8cc 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
@@ -21,16 +21,32 @@
---
user: "pga"
group: "pga"
-gateway_data_store_hostname: "pgadev.scigap.org"
-gateway_data_store_resource_id: "pgadev.scigap.org_7ddf28fd-d503-4ff8-bbc5-3279a7c3b99e"
+gateway_data_store_hostname: "web.dev.scigap.org"
+django_gateway_user_storages:
+ - alias: "default"
+ storage_resource_id: "web.dev.scigap.org_ba01452f-44e5-4e03-b35f-756630539198"
+ options:
+ directory: "{{ experiment_data_dir }}"
+ - alias: "pgadev"
+ storage_resource_id: "pgadev.scigap.org_7ddf28fd-d503-4ff8-bbc5-3279a7c3b99e"
+ options:
+ directory: "{{ experiment_data_dir }}"
django_wsgi_processes: 1
doc_root_dir: "/var/www/portals/django-{{gateway_id}}"
-admin_emails: "[('SGRC Group', 'sgrc-iu-group@iu.edu')]"
-django_error_emails: "[('Marcus Christie', 'machrist@iu.edu'), ('Eroma Abeysinghe', 'eabeysin@iu.edu')]"
django_database_name: "django_{{ gateway_id }}"
django_hidden_airavata_apps: "['django_airavata_dataparsers']"
tusd_vhost_servername: "tus.dev.scigap.org"
tusd_upload_dir: "{{real_user_data_dir}}/tus-temp-dir"
airavata_django_git_branch: "develop"
-# django_keycloak_ca_certfile_path: 'os.path.join(BASE_DIR, "django_airavata", "resources", "incommon_rsa_server_ca.pem")'
cilogon_userinfo_url: "https://cilogon.org/oauth2/userinfo"
+real_user_data_dir: "/media/volume/sdb/gateway-user-data"
+
+# Default email settings
+portal_email_host: "smtp.gmail.com"
+portal_email_port: 587
+portal_email_tls: true
+portal_email_username: "devdjango.portal@scigap.org"
+portal_email_password: "{{ vault_portal_email_password }}"
+portal_server_email: "{{ portal_email_username }}"
+admin_emails: "[('SGRC Group', 'sgrc-iu-group@iu.edu')]"
+django_error_emails: "[('Marcus Christie', 'machrist@iu.edu'), ('Eroma Abeysinghe', 'eabeysin@iu.edu')]"
diff --git a/dev-tools/ansible/inventories/scigap/develop-js2/group_vars/django/vault.yml b/dev-tools/ansible/inventories/scigap/develop/group_vars/django/vault.yml
similarity index 100%
rename from dev-tools/ansible/inventories/scigap/develop-js2/group_vars/django/vault.yml
rename to dev-tools/ansible/inventories/scigap/develop/group_vars/django/vault.yml
diff --git a/dev-tools/ansible/inventories/scigap/develop/host_vars/amp/vars.yml b/dev-tools/ansible/inventories/scigap/develop/host_vars/amp/vars.yml
index 876fd5025c..c57e5c728f 100644
--- a/dev-tools/ansible/inventories/scigap/develop/host_vars/amp/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/develop/host_vars/amp/vars.yml
@@ -19,10 +19,11 @@
#
---
-# No symlink, user_data_dir is same as real_user_data_dir
-user_data_dir: "{{ real_user_data_dir }}"
-#airavata_django_git_branch: "simccs"
+real_user_data_dir: "/media/volume/sdb/gateway-user-data"
+# Keep user_data_dir same as it was on old VM
+user_data_dir: "/data/gateway-user-data"
vhost_servername: "dev.ampgateway.org"
+# vhost_servername: "amos.js2.scigap.org"
vhost_ssl: true
# TODO: while developing django app, turn off SELinux, but turn it back on
@@ -30,14 +31,15 @@ vhost_ssl: true
httpd_selinux_mode: "permissive"
airavata_django_extra_dependencies:
- - "git+ssh://git@github.com/SciGaP/trecx-django-app.git#egg=trecx-django-app"
+ - name: "git+ssh://git@github.com/SciGaP/trecx-django-app.git#egg=trecx-django-app"
+ editable: true
# tus isn't setup yet
tusd_vhost_servername:
# sudo certbot --apache certonly -d django.simccs.scigap.org
-ssl_certificate_file: "/etc/letsencrypt/live/dev.ampgateway.org/cert.pem"
-ssl_certificate_chain_file: "/etc/letsencrypt/live/dev.ampgateway.org/fullchain.pem"
-ssl_certificate_key_file: "/etc/letsencrypt/live/dev.ampgateway.org/privkey.pem"
+ssl_certificate_file: "/etc/letsencrypt/live/{{ vhost_servername }}/cert.pem"
+ssl_certificate_chain_file: "/etc/letsencrypt/live/{{ vhost_servername }}/fullchain.pem"
+ssl_certificate_key_file: "/etc/letsencrypt/live/{{ vhost_servername }}/privkey.pem"
## Keycloak related variables
tenant_domain: "amp"
@@ -55,16 +57,17 @@ gateway_id: "amp"
experiment_data_dir: "{{ user_data_dir }}/django-amp"
gateway_data_store_resource_id: "dev.ampgateway.org_b8228bc7-fad2-45db-8ed1-47de359a54a5"
gateway_data_store_hostname: "dev.ampgateway.org"
-# gateway_data_store_ssh_public_key: "TODO"
+
+django_gateway_user_storages:
+ - alias: "default"
+ storage_resource_id: "{{ gateway_data_store_resource_id }}"
+ options:
+ directory: "{{ experiment_data_dir }}"
+
+gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCMuKQoD6K1DpgHyoY2/eyLMNc5UdupqWqBFEnSO24izMXeOqTityLDRrVZGMLvV/t9wZEig1dhg21Ic5wRSHpCra2BXRn+WjgVdR20EGWPkuFYoDyeMyp8YKjaf1+Fcz+2H52wnrC0RFOHExgB3DWkRSEGghyyIXSBPMxrpS+f0FAfTc36i+EQq2UC0n1xvcdrtGjCKv56mafiKgFfYHbFw7Y7eJxhDCYlRYnzeTJBxWATu9tMGKZgGOxdDXR5hjTvqnpMpk3QpvY/BzAYpCIXxZbb7C41vHaGA9kabjuSlQG4nd+YAxiPrUZdExQNHUE9SCPFQMd/FxsNGdf7YCGH"
django_error_emails: "[('Marcus Christie', 'machrist@iu.edu'), ('Eroma Abeysinghe', 'eabeysin@iu.edu'), ('Sudhakar Pamidighantam', 'pamidigs@iu.edu'), ('Dinuka De Silva', 'dinsdesi@iu.edu')]"
-portal_email_host: "smtp.gmail.com"
-portal_email_port: 587
-portal_email_tls: true
-portal_email_username: "pga.airavata@gmail.com"
-portal_email_password: "{{ vault_portal_email_password }}"
-portal_server_email: "{{ portal_email_username }}"
portal_title: "Dev AMP Gateway"
django_extra_settings:
diff --git a/dev-tools/ansible/inventories/scigap/develop/host_vars/amp/vault.yml b/dev-tools/ansible/inventories/scigap/develop/host_vars/amp/vault.yml
index f7731274a0..0ba8c59a6a 100644
--- a/dev-tools/ansible/inventories/scigap/develop/host_vars/amp/vault.yml
+++ b/dev-tools/ansible/inventories/scigap/develop/host_vars/amp/vault.yml
@@ -1,15 +1,12 @@
$ANSIBLE_VAULT;1.1;AES256
-39356230616664346264303637313033653665666332303662323762623939333436353530633536
-6232313462313161336164366538353337326461623936310a626434343066326134303437323437
-36336131316539376366643061373439616430663138396561663033383161643765363164333139
-3437383161653033630a356232366163653863663533636136313562636166666336663736373861
-63376361663137653465313538393664346230313764333961393831633332303335386536313131
-35633864623264633133666465376135663564643833653664666664646461313938303062306161
-37616630396237653633626339646539313335313432363661323437303236643038393139346665
-66316635323863353838393838643763613064633439346565343830376264663064356137326263
-62663233376561663362356332656331653762303031383438313935643338623430373630653839
-64393566306235323931323964356132383036656434313834373234353936326561376264633235
-36313934383565326537353730373035646130313736653533386261396331343435656239653035
-31303039393530653166306336333934343537613230353237323337363135633134393561613236
-62343362313564303063666433633165626362306139333863393335646262333938376561626132
-3165356531646134633839353664626236333761383335366661
+62343264326564323230663837373532633264306334616664656532656636393761336436393638
+3066336565383831643837336465383633393461346331610a616439626234613633393131643264
+35656539646362393233343835373766613930326461663466323638313263663034386334333731
+3030313335616539360a396534626637633065326330646166646664623462303533373232373065
+63663138343636653233303735353739356430636463646336376465376562613937306366373136
+62653062646662393466663163316630326632323665313633653936373835373865643936386666
+65333135313337623962313132366632306231306331313531383530616534313532386133663262
+64393236643130636334616234373037663337343139663762306462336130656265376463613166
+36396433636564306230613535666139386336313062333630653837366362343033306365363764
+30643737376563663364393961376238316431313139633335346430643964626530663765333261
+343663303662646533666664663762306634
diff --git a/dev-tools/ansible/inventories/scigap/develop/host_vars/csbglsu/vars.yml b/dev-tools/ansible/inventories/scigap/develop/host_vars/csbglsu/vars.yml
index 4d134717b4..0d26cccca1 100644
--- a/dev-tools/ansible/inventories/scigap/develop/host_vars/csbglsu/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/develop/host_vars/csbglsu/vars.yml
@@ -43,11 +43,5 @@ gateway_id: "csbglsu"
experiment_data_dir: "{{ user_data_dir }}/django-csbglsu"
gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCFlFv/4KuHykIWcOEvTa64ELh9/qNsF6qf11IjrseYp/th8agceygIViFkwfRZzAPj+Vx11Ic+NXKI3aOZjtauUKl+R+iRTMFDX39deV5hyCHPBJTTw7wqltmH/lxJOU0nMaAnQlXmNu+zHEmz0hhkfKn6sQdYFRMb6eDWtZwJqGHzIrZNOs+wxhJ7FBWQ+yDx8akutKEXX5Zka9fnTgOfoWP+ch262uzI/eeJgwuzlu0iFb7IKdHZm3FJEsUaz0W+u+mKY9uxktW16KW4xS2ox7smVUOyuZgxAwThSQjPe2kVZxJNgbN/uSxuGy0pOC+o+8Av/dK4qPI41A/4qKSv"
-portal_email_host: "smtp.gmail.com"
-portal_email_port: 587
-portal_email_tls: true
-portal_email_username: "pga.airavata@gmail.com"
-portal_email_password: "{{ vault_portal_email_password }}"
-portal_server_email: "{{ portal_email_username }}"
portal_title: "LSU Computational Sys Biology"
...
diff --git a/dev-tools/ansible/inventories/scigap/develop/host_vars/csbglsu/vault.yml b/dev-tools/ansible/inventories/scigap/develop/host_vars/csbglsu/vault.yml
index cd44294920..badad9844a 100644
--- a/dev-tools/ansible/inventories/scigap/develop/host_vars/csbglsu/vault.yml
+++ b/dev-tools/ansible/inventories/scigap/develop/host_vars/csbglsu/vault.yml
@@ -1,15 +1,12 @@
$ANSIBLE_VAULT;1.1;AES256
-35376533383933653663333732373638356661376130366531393338353437373665333563643062
-3633383838333936326436323332303862326232323630310a373963376539303630313530363764
-66343462343264323264663461386462333034386461643762653561386336393562346538393435
-3262353265306133370a633935653665373433333365376363383364343739306437323164656135
-37616539323838343666336638353164333739316662323664623262623362313936396137346232
-62363266623962643538633130356466323662633565383832386466336134383066663837613530
-62306661393065613036616537393538393065353430633937316538346137323166393430663265
-39316630623531636335653162656430646336653030383363306239636333366363636332383439
-32643536613963363734383435393865646663613830616632373831363631323964303236623930
-65373461643936656130663765323963633563626535656161613435323832393962653464306465
-66383130333462363335636166303630356564323862323436626335383136633937353033386439
-37663436363661633231663266346565333266363934623465613335663764623435653833396365
-64613335333931633639626163353861336462616265353766613063373739303465323861636539
-6334643136323863353037666464336331626238393136383463
+31373638663130386130363734303263353239336266613036386532396438613663373261666635
+6230373235653163646431346132363165346238383336320a633663323238363366626439303533
+66386631613661323736313330656564646235656632323536316263393265346135663964356438
+6134323139636339610a396465373939616565333965616665643966663830663035656165336263
+32613735343264656165353461666564303865386437326462353162633263653834303164396261
+36616634613662373165373934326337353437643931623461386564333462663736383464666138
+38333539356139363738386163613664393434633031343637353237666637323835643462363535
+33363965353138613461336230366132646631646134323536386338353833383766643664366132
+30653934323538646135326462656334376535393939333637396533643866363666636463393464
+30616161333165656137363464333537633035353330333830393961303562363065633235633436
+383238336137626439376135383937613337
diff --git a/dev-tools/ansible/inventories/scigap/develop/host_vars/custos-testdrive/vars.yml b/dev-tools/ansible/inventories/scigap/develop/host_vars/custos-testdrive/vars.yml
index 97675e1d77..70af791b2f 100644
--- a/dev-tools/ansible/inventories/scigap/develop/host_vars/custos-testdrive/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/develop/host_vars/custos-testdrive/vars.yml
@@ -50,13 +50,7 @@ gateway_id: "custos-testdrive"
experiment_data_dir: "{{ user_data_dir }}/django-custos-testdrive"
# gateway_data_store_ssh_public_key: "TODO"
-portal_email_host: "smtp.gmail.com"
-portal_email_port: 587
-portal_email_tls: true
-portal_email_username: "pga.airavata@gmail.com"
-portal_email_password: "{{ vault_portal_email_password }}"
admin_emails: "[('SGRC', 'circ-iu-group@iu.edu')]"
-portal_server_email: "{{ portal_email_username }}"
portal_title: "Custos Testdrive Portal"
...
diff --git a/dev-tools/ansible/inventories/scigap/develop/host_vars/custos-testdrive/vault.yml b/dev-tools/ansible/inventories/scigap/develop/host_vars/custos-testdrive/vault.yml
index b24a83f67c..c5652710c0 100644
--- a/dev-tools/ansible/inventories/scigap/develop/host_vars/custos-testdrive/vault.yml
+++ b/dev-tools/ansible/inventories/scigap/develop/host_vars/custos-testdrive/vault.yml
@@ -1,15 +1,12 @@
$ANSIBLE_VAULT;1.1;AES256
-65376664653563303263306237326364663964663330343739336663393833363366653861626662
-3139346333333063313534666166313462663330626530310a623538306266376562633939646565
-34353039303262366430323138303331356333636464643634363263353432356433393531626437
-3462333766333532350a666136656139313266643565393633633964326339333463396432386339
-66306431353934663634356466393836653136366134346335393730353230616532353963643430
-63646162356664633632623436393735623963346631313662396566396561616464376466343031
-64663532386638643865356265336236343639646434326666393336356461326333353265303961
-32353430326664346266366461343666633636316263393339623639636138303039373230373736
-38643637626466313064303534353232306539616666306336663964386439663762663637623032
-39633433636264646264616364363432383438323561643238656333373533316637396332343134
-35343131393233643562653964386633393962333935303861336466336432393463333532393761
-35653739633836393136306663306438666332643262386665643033643934636538303135663861
-31623563666366626562663039376339316164373865383964313766326631393233383037656264
-3938396563316432633638353966346330363563336563343133
+31613530626335633161633936396166633766353735346464626132616636343034623736333636
+3234376330316636326135303266353066383665383735620a353430643566616131646264356366
+30396262306665376362653439613337613861636266396338336562636261373061373737623264
+3239646262376137610a373939396631323534633935373431353166353531626665356565353335
+38343331316366326564343034306134346362313966316263386463636566373038303937373136
+62386538616164396135653733396431346162663837343739303366333361333739313738653636
+32386163366563363239626334323834636230303435383761643331316361363563343338663436
+61326132636662323736653037316638366266363138323837373533313737396135363464353134
+63383463383563323161613136663766343765316234643730393232656633393066303963653338
+65383164333730303239323161353533353230646261653037346530323264346661316164306662
+323638363033383462383332646531363264
diff --git a/dev-tools/ansible/inventories/scigap/develop/host_vars/cyberwater/vars.yml b/dev-tools/ansible/inventories/scigap/develop/host_vars/cyberwater/vars.yml
index a6241f6b7a..a0f9d451ea 100644
--- a/dev-tools/ansible/inventories/scigap/develop/host_vars/cyberwater/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/develop/host_vars/cyberwater/vars.yml
@@ -19,13 +19,12 @@
#
---
-#airavata_django_git_branch: "simccs"
-vhost_servername: "cyberwater.scigap.org"
+# vhost_servername: "cyberwater.scigap.org"
+vhost_servername: "cyberwater.js2.scigap.org"
vhost_ssl: true
-# sudo certbot --apache certonly -d django.simccs.scigap.org
-ssl_certificate_file: "/etc/letsencrypt/live/cyberwater.scigap.org/cert.pem"
-ssl_certificate_chain_file: "/etc/letsencrypt/live/cyberwater.scigap.org/fullchain.pem"
-ssl_certificate_key_file: "/etc/letsencrypt/live/cyberwater.scigap.org/privkey.pem"
+ssl_certificate_file: "/etc/letsencrypt/live/{{ vhost_servername }}/cert.pem"
+ssl_certificate_chain_file: "/etc/letsencrypt/live/{{ vhost_servername }}/fullchain.pem"
+ssl_certificate_key_file: "/etc/letsencrypt/live/{{ vhost_servername }}/privkey.pem"
## Keycloak related variables
tenant_domain: "cyberwater"
@@ -41,13 +40,7 @@ auth_options:
gateway_id: "cyberwater"
experiment_data_dir: "{{ user_data_dir }}/django-cyberwater"
-# gateway_data_store_ssh_public_key: "TODO"
+gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCgbggEQsHObu9N03L2mTOEwd6+U5w7j5VuYCkkbT8Cz/XNTDmdX/bNHlTlaWafm37mfmJznI6owl2XwoYWmV4etTs1OpPsffqDXkO7QUsDzvwWzWkqKjhkdD2e7pJ2dPdWrMQbDHdi7RnmapX4+JI042dqbJUd15xBgS0Jud/eVXGZsyeMDbGfMJ4m4ckV2ywSwvxAT5XFald5I25tdi7dwPA8g+hcIQNxRF+oBX5L+mepqTV5KNFQzmKFh1eREf8+yVkSU6NKLsZc2CSghquU58KKWtJbXEo9L31jcn0Jxxf3VjdchbLzAh3nVwoNhLfeYr5ox0YGpW6Xk3ROb14r"
-portal_email_host: "smtp.gmail.com"
-portal_email_port: 587
-portal_email_tls: true
-portal_email_username: "pga.airavata@gmail.com"
-portal_email_password: "{{ vault_portal_email_password }}"
-portal_server_email: "{{ portal_email_username }}"
portal_title: "Beta Cyberwater Gateway"
...
diff --git a/dev-tools/ansible/inventories/scigap/develop/host_vars/cyberwater/vault.yml b/dev-tools/ansible/inventories/scigap/develop/host_vars/cyberwater/vault.yml
index d84b6a8daf..06a2d4261a 100644
--- a/dev-tools/ansible/inventories/scigap/develop/host_vars/cyberwater/vault.yml
+++ b/dev-tools/ansible/inventories/scigap/develop/host_vars/cyberwater/vault.yml
@@ -1,15 +1,12 @@
$ANSIBLE_VAULT;1.1;AES256
-65396461353262326339353737663835306236633630323332636638343633316462626338333761
-6437356439626335323734663930323337633537313835310a623634373562346433623061343265
-36326232303037653262306139663464366465303734663665653535353834353636313431346539
-3138303032666438390a393161613930643833376463363534663462613039326337643233363936
-34623362326666396135336663333439613539383035636662393431326164313634396635353663
-34613566363734333033636630366230336235323234653665613436326639313663643730303863
-31663861613064313132316233376336346362633432636261653835633939326664313165353039
-63616438623865376131383632636136393564653665386431653764313735333538306665323737
-65336335373138633331643430643930303130653565303864643333313665623239386534643938
-30326534396662326262313234336637336334323636353439343730343030346264646461363361
-32343262333164356233303438623363373535633866303933306330313361613763393332656132
-65303530366131393131373761646361653966343133333337653437303263616538316338626562
-35373064316538383361383834393763636166386232393361623338343934356433383464393039
-6430373139346435373362326362613136383435353633396536
+38336537336435386532386632363938633665663334363538336262313761366162396130326262
+3365363363373431636330326230363732393464383061620a623438393830356333636661623134
+65616635633030336364346563353032613664356133396437323764306236653235323633636431
+3133653161393235650a636631396230323166346338653162636333383733636133363634333536
+66333939636134333663326138396334336266663731626466646432666430366539306338633336
+30613063326232313133396632323430623235356361663763356439366564623132633863656565
+66363934356562613462623231343338383230363036333230376262623431613464303264663663
+65636435303839383431656164623066646430663837383162346537366531636163623239663634
+64383531633336633138313261303436313131326137333563633531626664663033333661663933
+61326261633539313937626135376338646261316132393539646334326665613630386236663564
+363064386233646130663538303335343263
diff --git a/dev-tools/ansible/inventories/scigap/develop/host_vars/delta/vars.yml b/dev-tools/ansible/inventories/scigap/develop/host_vars/delta/vars.yml
index e8f39d6e62..48007e5bf1 100644
--- a/dev-tools/ansible/inventories/scigap/develop/host_vars/delta/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/develop/host_vars/delta/vars.yml
@@ -19,20 +19,20 @@
#
---
+# TODO: create a new gateway data store resource and update this (OR, maybe we can just update the hostname for the storage resource?)
gateway_data_store_hostname: "delta-topology.jetstream-cloud.org"
gateway_data_store_resource_id: "delta-topology.jetstream-cloud.org_a272f087-f733-433c-a32c-745577ed6067"
# tus isn't setup yet
tusd_vhost_servername:
-# No symlink, user_data_dir is same as real_user_data_dir
-user_data_dir: "{{ real_user_data_dir }}"
-#airavata_django_git_branch: "simccs"
-vhost_servername: "dev.delta-topology.org"
+real_user_data_dir: "/media/volume/sdb/data/gateway-user-data"
+user_data_dir: "/data/gateway-user-data"
+# vhost_servername: "dev.delta-topology.org"
+vhost_servername: "dev.delta.js2.scigap.org"
vhost_ssl: true
-# sudo certbot --apache certonly -d django.simccs.scigap.org
-ssl_certificate_file: "/etc/letsencrypt/live/dev.delta-topology.org/cert.pem"
-ssl_certificate_chain_file: "/etc/letsencrypt/live/dev.delta-topology.org/fullchain.pem"
-ssl_certificate_key_file: "/etc/letsencrypt/live/dev.delta-topology.org/privkey.pem"
+ssl_certificate_file: "/etc/letsencrypt/live/{{ vhost_servername }}/cert.pem"
+ssl_certificate_chain_file: "/etc/letsencrypt/live/{{ vhost_servername }}/fullchain.pem"
+ssl_certificate_key_file: "/etc/letsencrypt/live/{{ vhost_servername }}/privkey.pem"
## Keycloak related variables
tenant_domain: "dev-delta"
@@ -49,19 +49,13 @@ auth_options:
django_extra_settings:
GATEWAY_DATA_SHARED_DIRECTORIES:
shared_data:
- path: /var/www/portals/gateway-user-data/shared_data
+ path: /data/gateway-user-data/shared_data
gateway_id: "dev-delta"
experiment_data_dir: "{{ user_data_dir }}/django-dev-delta"
-# gateway_data_store_ssh_public_key: "TODO"
+gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCls5UgazweDc9d4NN65D+JVCeiBUhMSHTRWNHI6v1RPq/Or84fF41+HaemToQverQ73b/gUiXWuGfb75Y7JK5sgqRXCUiL1OVHICX3h4sh8UiMHEe5fUY/PNme2+witXYFr8EkYrdseJgnKXNULsgZEkuHzYbDFrn6z+pc4zXtoT/iUic8lUmeR1h8Quac7G0cSS0X8CFDMjkBKoX3KU7wffwuLGO2IhIdNpBgKzQUWRm6vEA48wdjEQTneX9rQefASOsbp/HNJHN/xsovFTNdatnezKz1Dt8cpSl32KEFs1YQYB6UmGJimRWiAAQBNCcaHLlgXWIQQ2U0vbsrVKZr"
-portal_email_host: "smtp.gmail.com"
-portal_email_port: 587
-portal_email_tls: true
-portal_email_username: "pga.airavata@gmail.com"
-portal_email_password: "{{ vault_portal_email_password }}"
admin_emails: "[('SGRC', 'circ-iu-group@iu.edu')]"
-portal_server_email: "{{ portal_email_username }}"
portal_title: "Dev DELTA Gateway"
...
diff --git a/dev-tools/ansible/inventories/scigap/develop/host_vars/delta/vault.yml b/dev-tools/ansible/inventories/scigap/develop/host_vars/delta/vault.yml
index d7b914f5ca..cf2dc9af9a 100644
--- a/dev-tools/ansible/inventories/scigap/develop/host_vars/delta/vault.yml
+++ b/dev-tools/ansible/inventories/scigap/develop/host_vars/delta/vault.yml
@@ -1,15 +1,12 @@
$ANSIBLE_VAULT;1.1;AES256
-61323461333234626436643737323133313661383665626165363430616364633834383136326336
-6563313362623566343834396331323738343931663938310a356564333262643139373633363663
-65626535303736366339356363343463363537666231396531313763326236353061306664373763
-6433323463306234620a643336663830303339323566336563646565636562326163306565643039
-30653766336266656234633734393461373864626661336365613835393137313235623734646438
-38613562366430393065616336613635333764396631613839666431313437376435653531343233
-32623763383736666132316537343132613662303865646562313163343036616132383237643439
-35333666366561303738316163636137353935636437653831393862633232643532363435613064
-66633863646239653632393666366432633931323665346164313063373837633030393733626530
-30656231353136616633326635326265626464646661393437616166666265323666613730623038
-34383031636238663832356236353735303630303238353961323538646162633130656430623235
-62623634356339613234613633336132363765633330383465363033363961306266376236636462
-64613561303661333338343832643734663536383834616165336534313961366465646463363531
-3130393161393630636466336666383164353737383266663238
+31653037356132313263353534323031356465623334633064636430343333636434396436383665
+6130643331393165363164623339333163306430373830350a643663383834613634626564623630
+36666664313936393165306531646538353564306266626138356631353261316236303466376139
+3863623139353434300a663133376661396338396634326338366430316461663566616539353037
+35616530316565356631303239336433333431363338326533373932366630313930663431626333
+37326134363131383030343331643064326237656463646338663933333263613837313530363863
+31343238626464353266343466643130326566393066663136313536393561386363343765386566
+32633837373430333038316566363830383338353365363064356364663039343536643939366131
+33663435323432336165316535393834303963353633633338653265323166316531613538303237
+37633164643363363632376363376332326364633064633935386366363933386437366335663831
+323963643930643236363863376464316265
diff --git a/dev-tools/ansible/inventories/scigap/develop/host_vars/geo/vars.yml b/dev-tools/ansible/inventories/scigap/develop/host_vars/geo/vars.yml
index fff2208f63..d9d3622f54 100644
--- a/dev-tools/ansible/inventories/scigap/develop/host_vars/geo/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/develop/host_vars/geo/vars.yml
@@ -21,22 +21,20 @@
---
airavata_django_extra_dependencies:
- - "git+https://github.com/GeoGateway/geogateway-django-app.git@ui-update#egg=geogateway_django_app"
-# - "git+https://github.com/GeoGateway/geogateway-django-app.git@master#egg=geogateway_django_app"
+ - name: "git+https://github.com/GeoGateway/geogateway-django-app.git@ui-update#egg=geogateway_django_app"
+# - name: "git+https://github.com/GeoGateway/geogateway-django-app.git@master#egg=geogateway_django_app"
+ editable: true
#Git hook is not set for this gateway
-# No symlink, user_data_dir is same as real_user_data_dir
-user_data_dir: "{{ real_user_data_dir }}"
#airavata_django_git_branch: "simccs"
-vhost_servername: "beta.geogateway.scigap.org"
+# vhost_servername: "beta.geogateway.scigap.org"
+vhost_servername: "geogateway.js2.scigap.org"
vhost_ssl: true
-# tus isn't setup yet
-tusd_vhost_servername:
# sudo certbot --apache certonly -d django.simccs.scigap.org
-ssl_certificate_file: "/etc/letsencrypt/live/beta.geogateway.scigap.org/cert.pem"
-ssl_certificate_chain_file: "/etc/letsencrypt/live/beta.geogateway.scigap.org/fullchain.pem"
-ssl_certificate_key_file: "/etc/letsencrypt/live/beta.geogateway.scigap.org/privkey.pem"
+ssl_certificate_file: "/etc/letsencrypt/live/{{ vhost_servername }}/cert.pem"
+ssl_certificate_chain_file: "/etc/letsencrypt/live/{{ vhost_servername }}/fullchain.pem"
+ssl_certificate_key_file: "/etc/letsencrypt/live/{{ vhost_servername }}/privkey.pem"
django_extra_settings:
LOGIN_REDIRECT_URL: "/geogateway_django_app/"
@@ -57,12 +55,6 @@ gateway_id: "beta-geo"
experiment_data_dir: "{{ user_data_dir }}/django-geo"
# gateway_data_store_ssh_public_key: "TODO"
-portal_email_host: "smtp.gmail.com"
-portal_email_port: 587
-portal_email_tls: true
-portal_email_username: "pga.airavata@gmail.com"
-portal_email_password: "{{ vault_portal_email_password }}"
admin_emails: "[('SGRC', 'sgg@iu.edu')]"
-portal_server_email: "{{ portal_email_username }}"
portal_title: "Beta GEO Gateway"
...
diff --git a/dev-tools/ansible/inventories/scigap/develop/host_vars/geo/vault.yml b/dev-tools/ansible/inventories/scigap/develop/host_vars/geo/vault.yml
index 134259bb24..eae52ff8cd 100644
--- a/dev-tools/ansible/inventories/scigap/develop/host_vars/geo/vault.yml
+++ b/dev-tools/ansible/inventories/scigap/develop/host_vars/geo/vault.yml
@@ -1,15 +1,12 @@
$ANSIBLE_VAULT;1.1;AES256
-33643638633466663966303839316236303531303064346635633938613535663431313234643636
-6131383264383263633131646464356539643433356539370a613331633039363534303761393561
-32613539333162633939356239303863383965363464376333366236373265656266663963623733
-3733306230323232340a386435333465613237356463303666653230616566643032333230636533
-32343363643266303664396664376461303337376339303434353331396261363736663034376661
-66303962623738356465643036313865386261323036363437343764666632666230366337616263
-31373735626232333237326535333233386166366637373336383832623661336331383933656532
-62363431353566656332376630313331626237626234653237366462316665386364353634643761
-30343832303963613736343561343539353564666331303935623738353835356230323230383731
-34373064386535383361306364356665306239323232386530336532356430353262653134333332
-39306565323138383631623036613265303066386337356530383238313532313861373934306566
-62633062333737323635633330636363373938316537313165303663306161333835663032333037
-64396434653864663738653861316338333736363239373331323730663763366634383565323138
-3539356466636239643663656239346161323236623564306565
+61356465636564633862643661373632373161393436643932313536326434303136633133323530
+3632323832393335313162356263386231383335383139640a373335626539393133333136323637
+33613431366530313862623836366266623539356566623933633637323433366133333863316637
+6362363437373236360a313962383762333731663933336666303066356230613138333539376438
+66333763336439613934313164356437646630623735346338646236356331383166323336333035
+65633538343439633130313332643366393863643861363663656430333364316664363230336638
+66383036363434633736343530636161323639316238663865366434653934396438303663616563
+34383635613636633462323338393831336634323938616534633630663234373330316336313837
+66643433643932373132383363393261396639623231356630333739373733633138663037363434
+33613139636461386435626362633565346436643435653464326632333266346463353235393364
+306237356139393639623639356130373435
diff --git a/dev-tools/ansible/inventories/scigap/develop/host_vars/interactwel/vars.yml b/dev-tools/ansible/inventories/scigap/develop/host_vars/interactwel/vars.yml
index 5d19dd95bd..57d015ef22 100644
--- a/dev-tools/ansible/inventories/scigap/develop/host_vars/interactwel/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/develop/host_vars/interactwel/vars.yml
@@ -19,19 +19,17 @@
#
---
-#airavata_django_git_branch: "simccs"
-#vhost_servername: "django.interactwel.scigap.org"
vhost_servername: "interactwel.org"
-vhost_server_redirect: "www.interactwel.org"
vhost_ssl: true
-# sudo certbot --apache certonly -d django.simccs.scigap.org
-ssl_certificate_file: "/etc/letsencrypt/live/interactwel.org/cert.pem"
-ssl_certificate_chain_file: "/etc/letsencrypt/live/interactwel.org/fullchain.pem"
-ssl_certificate_key_file: "/etc/letsencrypt/live/interactwel.org/privkey.pem"
+ssl_certificate_file: "/etc/letsencrypt/live/{{ vhost_servername }}/cert.pem"
+ssl_certificate_chain_file: "/etc/letsencrypt/live/{{ vhost_servername }}/fullchain.pem"
+ssl_certificate_key_file: "/etc/letsencrypt/live/{{ vhost_servername }}/privkey.pem"
interactwel_django_app_branch: "api-integration"
-airavata_django_extra_dependencies:
- - git+https://github.com/InterACTWEL/interactactwel-django-app.git@{{ interactwel_django_app_branch }}#egg=interactwel-django-app
+# Disable installing the interactwel app until we can fix the install
+# airavata_django_extra_dependencies:
+# - name: git+https://github.com/InterACTWEL/interactactwel-django-app.git@{{ interactwel_django_app_branch }}#egg=interactwel-django-app
+# editable: true
django_extra_settings:
LOGIN_REDIRECT_URL: "/interactwel/"
@@ -54,11 +52,5 @@ gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCK+P6a
# Show the Data Parsers app option for Interactwel
django_hidden_airavata_apps: "[]"
-portal_email_host: "smtp.gmail.com"
-portal_email_port: 587
-portal_email_tls: true
-portal_email_username: "pga.airavata@gmail.com"
-portal_email_password: "{{ vault_portal_email_password }}"
-portal_server_email: "{{ portal_email_username }}"
portal_title: "InterACTWEL Gateway"
...
diff --git a/dev-tools/ansible/inventories/scigap/develop/host_vars/interactwel/vault.yml b/dev-tools/ansible/inventories/scigap/develop/host_vars/interactwel/vault.yml
index 6db56fbda1..5d6d86f63c 100644
--- a/dev-tools/ansible/inventories/scigap/develop/host_vars/interactwel/vault.yml
+++ b/dev-tools/ansible/inventories/scigap/develop/host_vars/interactwel/vault.yml
@@ -1,15 +1,12 @@
$ANSIBLE_VAULT;1.1;AES256
-37326136616530386334623934653233356133363761373635633230346230326133326363373465
-6130306233313739663635363432333362323033643937380a393735393739643230353863363635
-35626564396230323533653138373637303164663237313066323737393364383231323264343639
-6661613266303832300a333661633832393233353230363734343838343933333831613131613135
-65366263343861313337313934336637353262643966336336656361656234373731356338623833
-34623138633839353838626134646230613237343764313435656463383133376135613239386235
-37663364366635383130643636313631326362666466636637316465386633333933363263386138
-30303763363666636338356662326261353730336363653862633431303034376630326637633532
-32633836363137306662376331343431393334613139643965623036636462383330313963363833
-30336435653337666236623364343439313538393763643232353636316664633063363962646138
-30643433323664633266653937353564643631303830613864393565373364303338613130343564
-62356439393737393436303631316337373238633063633136613164353566316161646639623031
-66633763663834303161383966626462303165313938656236396233616262333239316161373235
-6563623365313133613833633033666265383337366431336465
+39613839636263333166306433313461616164363966663636653939356235363536366136663766
+3863653431303038383933393035616330643839663135380a353866663834396264313331333730
+33393539613135363239376334313033323338633366393266333536306663383661336338653036
+6533356430326166300a376130343737393339636638333033383835313333633961636662383764
+65646130346235633734336131323237343938666139613530626235333964323434326532323639
+36633633343361633133353864653435323563333865316137313539333438663935333461353430
+65653239643230313463393239333263346664326461303439646638343261656437656537353665
+36366530613538306163396232306533386161303136386535653335386166356234303263306161
+30636539336439376632323561663366323765333739653132633836306537313430616561363665
+35623238633236353533316461353530323139393636663163343736666365363739653934373938
+623263373937633464336631373237356364
diff --git a/dev-tools/ansible/inventories/scigap/develop/host_vars/mines/vars.yml b/dev-tools/ansible/inventories/scigap/develop/host_vars/mines/vars.yml
index 4d1a25afc5..3a548a03a5 100644
--- a/dev-tools/ansible/inventories/scigap/develop/host_vars/mines/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/develop/host_vars/mines/vars.yml
@@ -43,12 +43,6 @@ gateway_id: "mines"
experiment_data_dir: "{{ user_data_dir }}/django-mines"
# gateway_data_store_ssh_public_key: "TODO"
-portal_email_host: "smtp.gmail.com"
-portal_email_port: 587
-portal_email_tls: true
-portal_email_username: "pga.airavata@gmail.com"
-portal_email_password: "{{ vault_portal_email_password }}"
admin_emails: "[('SGRC', 'sgrc-iu-group@iu.edu'), ('Matthew T Jones','matjones@mymail.mines.edu')]"
-portal_server_email: "{{ portal_email_username }}"
portal_title: "Mines Gateway"
...
diff --git a/dev-tools/ansible/inventories/scigap/develop/host_vars/mines/vault.yml b/dev-tools/ansible/inventories/scigap/develop/host_vars/mines/vault.yml
index 71935b6213..69982fc8f9 100644
--- a/dev-tools/ansible/inventories/scigap/develop/host_vars/mines/vault.yml
+++ b/dev-tools/ansible/inventories/scigap/develop/host_vars/mines/vault.yml
@@ -1,15 +1,12 @@
$ANSIBLE_VAULT;1.1;AES256
-63663361373130616432323633626237653131656333333266393731393432393135623561356365
-3163343134306533393737313236353139633962373634360a643164373863623836373762346636
-65393430303034666534376563383132646233363464393430313232386363653039356431623636
-3963353737306536650a613934376331353835663838636363646165396232303865666462363661
-65626364393239346332646637323934653638323836363433346539653838333533376230373239
-39306236303732373037656537356538313265343935363430336535613964666563396464376636
-37623163383633396664666631333038633533636566363061393438366332623566643538353633
-61333563346434326331633265623734343736396138373165396235646562646333646234343238
-30383134376162613434303566663730316338363965336237316463353731613163356463326634
-33646235383933313062366430316265373338633463363734626162393665303839363434303633
-64326264353734646563323931313435366431306338313635363834383366643737323066326339
-64376536336139646664643638363761303836313038386638613634343265346633303533376135
-33343535613731396561383630366337356461323836633838363334396332353437663433356636
-6566343137373438643235303032316430656237333335663362
+35363261663563643366386135396661353563383632313062353866333835316439616337633366
+6233333033656135373631623331663535396339623834610a633930656463383261653336303735
+64633538366531633333353661373435343561313033643733303331383838363166313265316134
+3665323633633136320a333232303165356538626364346262326662333566396533343333623935
+63343430323766666137613335663462393166663033383235343532623636623231373964333130
+34396131313637613238373666633438373034306434636533646364333165343538666236356263
+31366532666566623935393337643538326233646663346266633134333837643931393963343930
+62326361356132666433386533393033313736373032303761666236623131356430626137346464
+65633338643666363264626438643966616336623934326330653766393936376636343865383864
+30336335353239373933616162313361313331306433313830643061643730363431653164626436
+353064363864643636643437666138313133
diff --git a/dev-tools/ansible/inventories/scigap/develop/host_vars/nexttdb/vars.yml b/dev-tools/ansible/inventories/scigap/develop/host_vars/nexttdb/vars.yml
index 00fc76b5c1..b4352340b7 100644
--- a/dev-tools/ansible/inventories/scigap/develop/host_vars/nexttdb/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/develop/host_vars/nexttdb/vars.yml
@@ -43,11 +43,5 @@ gateway_id: "nexttdb"
experiment_data_dir: "{{ user_data_dir }}/django-nexttdb"
# gateway_data_store_ssh_public_key: "TODO"
-portal_email_host: "smtp.gmail.com"
-portal_email_port: 587
-portal_email_tls: true
-portal_email_username: "pga.airavata@gmail.com"
-portal_email_password: "{{ vault_portal_email_password }}"
-portal_server_email: "{{ portal_email_username }}"
portal_title: "Next Generation Thermodynamics"
...
diff --git a/dev-tools/ansible/inventories/scigap/develop/host_vars/nexttdb/vault.yml b/dev-tools/ansible/inventories/scigap/develop/host_vars/nexttdb/vault.yml
index 2ca53e32e7..ff6d3485a0 100644
--- a/dev-tools/ansible/inventories/scigap/develop/host_vars/nexttdb/vault.yml
+++ b/dev-tools/ansible/inventories/scigap/develop/host_vars/nexttdb/vault.yml
@@ -1,15 +1,12 @@
$ANSIBLE_VAULT;1.1;AES256
-31643731393639363263303532666232363766313764343761623564396463633662356634306539
-6633376461663638663161663837393261326262393764370a346631383433643935363837326561
-35376434343765323335633936646333626335326434643236363462343436623564393166653361
-3166313536323638660a393335313966666265653133653134323534653034333738313838303431
-62626139636266373432353563313937386666333166303031363062373136363230663734373739
-38306335613162356564376537333336626437373164616366623330666439353530363665663638
-65633537343765333939393130306236363537386565346264326563613461323735643431613734
-65646337653463653033623562353862343562363964343131653436303032366635393966626539
-35656330643232396565343230616534303764313030333364303939623062623766343362636238
-61343039653961333230333839396433366637633535326333303463353637383662326362393935
-36346535323035643334376636323533336531323965613036376635343636336633363735386130
-36333865303730333236376262316561393939393162636636663761383465633536623330633338
-65323463613764633639333535633764666362353461333230613562613465336137633837393062
-3036633135643937646635653739636232326365353062396365
+66316130346363653762646661643938653839613238666637376139643233636361303265376631
+6135323363616161636339326232616465643634383835610a336236393362393661666236303630
+35323537333736316439356235663538346331393863323836393264353636613861626332343734
+3335333861343938360a373761666631383933666634316665613130346461653566346230623961
+32313338613030383630376336393030396336623066633465653537623436373762313336363032
+65316135643333366230323139333239616461623039363361653836303832306462396363626432
+32373433383762636232653861636333373261366666663563393362383635336561373531303761
+37313062383630323431346162653633353230313338613662623163306261393431363530336162
+37356166333861316661376235386531323236653266356662316636613235646433343361333662
+64343533316633323734646230663236633930326335613334383966666338353131396630363430
+623665333034643837636339616162363734
diff --git a/dev-tools/ansible/inventories/scigap/develop/host_vars/pfec-hydro/vars.yml b/dev-tools/ansible/inventories/scigap/develop/host_vars/pfec-hydro/vars.yml
index 8ec0a667a1..26614f25ca 100644
--- a/dev-tools/ansible/inventories/scigap/develop/host_vars/pfec-hydro/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/develop/host_vars/pfec-hydro/vars.yml
@@ -43,11 +43,5 @@ gateway_id: "pfec-hydro"
experiment_data_dir: "{{ user_data_dir }}/django-pfec-hydro"
gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCVUiDweafreHh7nN4vabpG0wHrlyYCAObDtjmjP9hist848Y25BP+Rdq+64xHlKmJ1CDDZmjmb9T6JI5JhzYvg0RoD2WxDFcV10y7wamzT7b5TjGK/x11Qwh68qNfAi5amePvkL5oE/HCG95oKityG24EUt3yNOttOLYFnbdnlUXQiDkk1xT/8mbtAPXKnhjopYebwjsK7tYBzGe6YIU0teMA2goWl/6WjTWQBikhSOR1P074qEKzrvqt5mQqVi1HDpHKPP+JA/6upJu2THPNqUw2XuzkwFLkPAjUlnj2NugKTdUZco3lRc2lyjb2OEGuFO6I41WB/xnbBhQOXqDJX"
-portal_email_host: "smtp.gmail.com"
-portal_email_port: 587
-portal_email_tls: true
-portal_email_username: "pga.airavata@gmail.com"
-portal_email_password: "{{ vault_portal_email_password }}"
-portal_server_email: "{{ portal_email_username }}"
portal_title: "Beta Future Water Gateway"
...
diff --git a/dev-tools/ansible/inventories/scigap/develop/host_vars/pfec-hydro/vault.yml b/dev-tools/ansible/inventories/scigap/develop/host_vars/pfec-hydro/vault.yml
index 59164d2272..68c7e5f58e 100644
--- a/dev-tools/ansible/inventories/scigap/develop/host_vars/pfec-hydro/vault.yml
+++ b/dev-tools/ansible/inventories/scigap/develop/host_vars/pfec-hydro/vault.yml
@@ -1,15 +1,12 @@
$ANSIBLE_VAULT;1.1;AES256
-66386331633433666234306335626466663633366330346333323061653235343431653135343763
-6331323465613334336138613266656237353234643062310a653838306334633231656537363565
-63633366376438363230333262383964616136313238636330326461626335356338373038396130
-3062323066396130300a646535323638373666383461356536303665396363343034333532353039
-39336366373335333565336633333537346464653038363862366265656463653337336464306438
-32376136336638333530306630313436633564643166653763313462323162633361306637646365
-62373935663561613466666666653032623838383864313134653237613062323133303635396665
-38323139333434393334383265646664383239376661636439623236373333376662633363383063
-63386533643130636234303738343430643863373762643338306139656464306166383866376465
-66353334383839336330333538396564326563623237373333363163303539663738363130313565
-30633164343366633432663866623063356363633234366630623239303936656366326364386339
-30623131646661383636623633616562313233626166333837353965353335386332613832373734
-34333965323763353263653436363933393032376637633036343230303230326636353030633436
-3135363433313565396530303266386466306130643034636334
+31343631303938373564643839356435306632656333656366636234313030393739333061383566
+3666303032303234323234623462646234616235616630300a623636383363643166616335343164
+33666264323735326666646661356662353934613434316138643131613937393231643939313637
+3436653661323766370a623363643530623935616364386265636130363235616263646637653066
+34303536663539653338373936306336373234386434363733626661623834646664356637313831
+63663566366563373762656338613334303639346630653563373835666330306366356338636563
+30383637653339363130343032643664356139326438303938653662306162303161346633373561
+38616634373837376266303766656566323034363966646133666135633831306537386338386662
+36383465323735333438303633313235383062646261376631383930616363623835323936383137
+36363537643735636265666230333833623535616462653839353165313239323135616363316534
+353634643930626263346130626233646165
diff --git a/dev-tools/ansible/inventories/scigap/develop/host_vars/rnamake/vars.yml b/dev-tools/ansible/inventories/scigap/develop/host_vars/rnamake/vars.yml
index 624a742c04..689b738514 100644
--- a/dev-tools/ansible/inventories/scigap/develop/host_vars/rnamake/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/develop/host_vars/rnamake/vars.yml
@@ -19,13 +19,11 @@
#
---
-#airavata_django_git_branch: "simccs"
-vhost_servername: "dev.rnamake.scigap.org"
+vhost_servername: "rnamake.js2.scigap.org"
vhost_ssl: true
-# sudo certbot --apache certonly -d django.simccs.scigap.org
-ssl_certificate_file: "/etc/letsencrypt/live/dev.rnamake.scigap.org/cert.pem"
-ssl_certificate_chain_file: "/etc/letsencrypt/live/dev.rnamake.scigap.org/fullchain.pem"
-ssl_certificate_key_file: "/etc/letsencrypt/live/dev.rnamake.scigap.org/privkey.pem"
+ssl_certificate_file: "/etc/letsencrypt/live/{{ vhost_servername }}/cert.pem"
+ssl_certificate_chain_file: "/etc/letsencrypt/live/{{ vhost_servername }}/fullchain.pem"
+ssl_certificate_key_file: "/etc/letsencrypt/live/{{ vhost_servername }}/privkey.pem"
## Keycloak related variables
tenant_domain: "rnamake"
@@ -43,12 +41,6 @@ gateway_id: "rnamake"
experiment_data_dir: "{{ user_data_dir }}/django-rnamake"
# gateway_data_store_ssh_public_key: "TODO"
-portal_email_host: "smtp.gmail.com"
-portal_email_port: 587
-portal_email_tls: true
-portal_email_username: "pga.airavata@gmail.com"
-portal_email_password: "{{ vault_portal_email_password }}"
-portal_server_email: "{{ portal_email_username }}"
admin_emails: "[('SGRC', 'sgrc-iu-group@iu.edu')]"
portal_title: "Dev RNAMake Gateway"
...
diff --git a/dev-tools/ansible/inventories/scigap/develop/host_vars/rnamake/vault.yml b/dev-tools/ansible/inventories/scigap/develop/host_vars/rnamake/vault.yml
index cc8352fb77..a98858350e 100644
--- a/dev-tools/ansible/inventories/scigap/develop/host_vars/rnamake/vault.yml
+++ b/dev-tools/ansible/inventories/scigap/develop/host_vars/rnamake/vault.yml
@@ -1,15 +1,12 @@
$ANSIBLE_VAULT;1.1;AES256
-63316435653432326363393233663639343166633063346132633630386531383365656239306363
-6135623339323338643939346434303162363635316665320a383838633162636436613838343865
-31666461663737366663633531633662623732323931633161623136313430626164313961323561
-6262306231383531610a663536613538656432303763613461383937663962393938333839303336
-64643534363637343031363634643532623464663938653538633532386566383831313833613065
-61363036396634376139333461623037363139626663303137363665646233646231666537633064
-30353733323931376161343530313831663935393031653064633965636434666235316164656637
-65313061613032343532336264373063376465363439353438366337396330386666373837663062
-62343635656234656234376336633966613835343330653339643338386634343663646161333966
-39643065336661643663376337356333323137353438326535313564666539303461626664313166
-32373964363637306136323361306463333164646166383462343062333832633639653538323431
-63353230313665386232663531653630666539653833333464363566383763393761353638306139
-39333031663366633765323563616366306362353237636262613165376234313438633133653261
-6137343464653537313262376265613431376163313933316631
+33396464353636353931363663653635306535333236313130316263643333303936663966663433
+3636616463356463626161323732343338336537323665620a653363633230386336653764663635
+61306539303433393138376162346562306632636230343261313837333235353936636635373165
+3166313038303034650a613336383631313338643065383439353132383061303333383034626338
+32336366613738326530626565356665333735636637396336346134396566643137323234326233
+36626231373631383938326439343262656534383533396236323332313435333633386162666263
+66313530393764386630323138333339633333646633383430316333616633363262643565353739
+61346363386431656235343061303734653535323632346634633031373437356364616231323463
+35333030666539633633386335303731393538303332393738613232373434613663313430623965
+34303632356466326132323831326363383164663633623535656334323765306261643030626236
+306665373938613165356361363663633638
diff --git a/dev-tools/ansible/inventories/scigap/develop/host_vars/saver-x/vars.yml b/dev-tools/ansible/inventories/scigap/develop/host_vars/saver-x/vars.yml
index ee0184c165..dd3c8ee62f 100644
--- a/dev-tools/ansible/inventories/scigap/develop/host_vars/saver-x/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/develop/host_vars/saver-x/vars.yml
@@ -43,11 +43,5 @@ gateway_id: "saver-x"
experiment_data_dir: "{{ user_data_dir }}/django-saver-x"
gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCXm3BdHBlCa4xX2dgq5NNONElxAla4ijczVnEG+NtxMM6H6joasxAUAlhAKZ4752T8bYGMopKELVKWzhiNELgsOitQcXODh27eAbQ0/DXDy9EEMYYTLzEzj89lpaHjh1HK1BrVCtfhnmHDr7nczQ2ywHroaKKTXfMt8AA0XqUF68bcVxAiqD2LiEFlSOq3ebLpqcD0188gWKT1T1BG1xhiUO+8XyDAdBnFqudGAkvQeTDhODSkVuD+kWZwj6/bfI9YHMqr8hXA6HpRrIrPr3hE6BUYci8y8gmfyJ9oLTo+0gMFzer8K/BMVU+bKZwSTtUZ0Xbr7wf28OH4wuzrhQd3"
-portal_email_host: "smtp.gmail.com"
-portal_email_port: 587
-portal_email_tls: true
-portal_email_username: "pga.airavata@gmail.com"
-portal_email_password: "{{ vault_portal_email_password }}"
-portal_server_email: "{{ portal_email_username }}"
portal_title: "Saver-X Gateway"
...
diff --git a/dev-tools/ansible/inventories/scigap/develop/host_vars/saver-x/vault.yml b/dev-tools/ansible/inventories/scigap/develop/host_vars/saver-x/vault.yml
index 557a7ecc26..2b6b68233d 100644
--- a/dev-tools/ansible/inventories/scigap/develop/host_vars/saver-x/vault.yml
+++ b/dev-tools/ansible/inventories/scigap/develop/host_vars/saver-x/vault.yml
@@ -1,15 +1,12 @@
$ANSIBLE_VAULT;1.1;AES256
-36663437633532656233366136666262363937316261373165366164623763306136343166323862
-6333353166663439653939363034323366393264363838330a333261356463306134343932333966
-66636333613866326338363937643261363764663363386262383362386131333336363934636235
-6465393038343263330a653537396463316333666364316234653564373636316162363766396163
-65313636303338303166633736666638643737613730333762663063633230333931336238646135
-30383738333061386566643532646531333062386563353036633763623761343266373665643865
-66663830323533376262346231656461633930396163313034393461303139303938636566613064
-38623938396132366566303661646564636136336633356135393131343661323164356437646539
-63346430396438346233333638353435346561663832396665663364373431663030353639626566
-63383831656236303839336437383034333738656636373231366133656266653161633064323531
-36646432313062316563373463373032313334633965353966396362353266383331376266363662
-36313064303936623736663939303764373961356532373439366238343632663739353862313761
-31636634373537656162646533326236363732373832656465656266306432663938326639363930
-6535306264373366616566666335333839623739313666386465
+37666463386433636364363830646561353537613365343662363230343165336434633936323736
+3761386466643632326438393834333136636537303731630a613962386564313439663966306530
+63663066356337323339383131376335653331343530353337616534343537313261633731343731
+6332393430376261640a636436656331366133353432613634303964646261303635353263366665
+39376235343664343936396661323964363232313566646635353263393537353865643464366164
+65636330393839636436356665323736383565363038396533326138623638623538333234653665
+62663864623338303264346232366564393061393130326261333136306138363761363830653132
+36663435363363666638623037323566336265623663653336326531306332393535616537393433
+36623564363039306465383163653565653362353031663165393964336165366163653635613034
+37363766366662626333343462376165313063633765626666653134646431356436353134376434
+356533356365373264646537623765636333
diff --git a/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/scigap/vars.yml b/dev-tools/ansible/inventories/scigap/develop/host_vars/scigap/vars.yml
similarity index 100%
rename from dev-tools/ansible/inventories/scigap/develop-js2/host_vars/scigap/vars.yml
rename to dev-tools/ansible/inventories/scigap/develop/host_vars/scigap/vars.yml
diff --git a/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/scigap/vault.yml b/dev-tools/ansible/inventories/scigap/develop/host_vars/scigap/vault.yml
similarity index 100%
rename from dev-tools/ansible/inventories/scigap/develop-js2/host_vars/scigap/vault.yml
rename to dev-tools/ansible/inventories/scigap/develop/host_vars/scigap/vault.yml
diff --git a/dev-tools/ansible/inventories/scigap/develop/host_vars/seagrid/vars.yml b/dev-tools/ansible/inventories/scigap/develop/host_vars/seagrid/vars.yml
index 922710f3b4..20936fdbad 100644
--- a/dev-tools/ansible/inventories/scigap/develop/host_vars/seagrid/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/develop/host_vars/seagrid/vars.yml
@@ -19,11 +19,11 @@
#
---
-vhost_servername: "django.seagrid.org"
-vhost_ssl: True
-ssl_certificate_file: "/etc/letsencrypt/live/django.seagrid.org/cert.pem"
-ssl_certificate_chain_file: "/etc/letsencrypt/live/django.seagrid.org/fullchain.pem"
-ssl_certificate_key_file: "/etc/letsencrypt/live/django.seagrid.org/privkey.pem"
+vhost_servername: "js2.seagrid.org"
+vhost_ssl: true
+ssl_certificate_file: "/etc/letsencrypt/live/{{ vhost_servername }}/cert.pem"
+ssl_certificate_chain_file: "/etc/letsencrypt/live/{{ vhost_servername }}/fullchain.pem"
+ssl_certificate_key_file: "/etc/letsencrypt/live/{{ vhost_servername }}/privkey.pem"
## Keycloak related variables
tenant_domain: "seagrid"
@@ -43,13 +43,7 @@ gateway_id: "seagrid"
experiment_data_dir: "{{ user_data_dir }}/django-seagrid"
gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCFgLWSw6Mf0tPbkeSyzPMxgT50cNEXFDiE9UnEx0tIm+is9C3hIK78Ct8NAWgPxdXy1vd/9NBVIqkR516NZ7VyGbUHkrtPLOYL+Of9IyvxOQmrLzTLQNS9yVkxwxykJzBePZySyLcOKQdG8YoNj6+2iRolzfo5/w4Gz+MSqKmPJcVH8hjwTdoE5s0hYU4MaLF966hh6LUH7SG31BcTadtEgnE8nYfxeoa20oj0h0n1LKO06OZgVXVN3iulHimQ1paQiW71X9UPUhgpLnYAiI99BmYOQqEM4IndwZLZPwDeb23A0Dh3bLO8CAPgPRcG5b1Da6kABi5i5gcIt3WCJzeP"
-portal_email_host: "smtp.gmail.com"
-portal_email_port: 587
-portal_email_tls: true
-portal_email_username: "pga.airavata@gmail.com"
-portal_email_password: "{{ vault_portal_email_password }}"
-admin_emails: "[('SGRC', 'sgg@iu.edu'), ('Sudhakar Pamidighantam', 'pamidigs@iu.edu'), ('Eroma Abeysinghe', 'eroma.abeysinghe@gmail.com')]"
-portal_server_email: "{{ portal_email_username }}"
+admin_emails: "[('CIRC', 'circ-iu-group@iu.edu'), ('Sudhakar Pamidighantam', 'pamidigs@iu.edu'), ('Eroma Abeysinghe', 'eroma.abeysinghe@gmail.com')]"
portal_title: "SEAGrid Portal"
...
diff --git a/dev-tools/ansible/inventories/scigap/develop/host_vars/seagrid/vault.yml b/dev-tools/ansible/inventories/scigap/develop/host_vars/seagrid/vault.yml
index 9532969b66..75cc2a588b 100644
--- a/dev-tools/ansible/inventories/scigap/develop/host_vars/seagrid/vault.yml
+++ b/dev-tools/ansible/inventories/scigap/develop/host_vars/seagrid/vault.yml
@@ -1,15 +1,12 @@
$ANSIBLE_VAULT;1.1;AES256
-38363231616661613836636332376135336234396638303533623930626630623034613630393935
-6131376661613863613661336664613737383665613562340a303864363338643735363761313861
-65396264626366306463633733356366326539336534623337383566623336356435356662653434
-3962393230653937650a623664613166313034623733633065643534316332383664343162313362
-32393233353061356231393964303532653332383033643331363263383664373639613961353562
-37626636623163316430613030313933363739656136666265633936626630373638373732653231
-35666436346130646430666365323265623839306333663366613963656132313334373166643636
-34623937663265363231336363663762356465616362323363323234316563326439303034306430
-62613931313963616362313737636237313362363334643833653434353564376536666465343462
-38386362656363653538343532646630373635653031383330616531343432613661653934356131
-39396239653839323763376561386336333137363234336338666165323666666630653666656566
-30363736306538373037666133373634663165356130326430326263386130623432666539336433
-35663934356562626331343862313963613031653561373830663461376630386161643264646463
-6436303662383661633562306666386564396230303239663930
+36366565666433336663626538613763383233336439316438313934643863356637393931343731
+3861633463306432633930376631643961633665666238660a633336623863616164666232633335
+32353237626364373930326264633366343131653334613166343231663665363662636265623164
+3965363737616535320a623733623664343261303866613031653262343861363631343236373336
+39633535386665363832373165376164643639623333323965363238326636386336656365383634
+33383639623662373335346130663761393239333335646665353933393961643263366435643139
+61346661396134356365633433663138663139366463306461613363353866353736366662343733
+65326233373331383864633837376265323639353335356637303861383031373862306562303938
+33346531346530656631366130623832616366336231633131393564656131396661353137353364
+35326535666664326536623134636638376161393066373632656438656633663833643435646365
+343339363830616536666436653637303561
diff --git a/dev-tools/ansible/inventories/scigap/develop/host_vars/simccs/vars.yml b/dev-tools/ansible/inventories/scigap/develop/host_vars/simccs/vars.yml
index 54c007ca6c..6ebcd9123c 100644
--- a/dev-tools/ansible/inventories/scigap/develop/host_vars/simccs/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/develop/host_vars/simccs/vars.yml
@@ -26,16 +26,16 @@ airavata_django_extra_dependencies:
# just cython, then a second with the other dependencies. Reason: pyjnius
# requires that cython already be installed and they can't both be installed
# at the same time.
- - cython
- - "git+https://github.com/SciGaP/simccs-maptool.git@{{ simccs_maptool_branch }}#egg=simccs-maptool"
- - pyjnius
+ - name: cython
+ - name: "git+https://github.com/SciGaP/simccs-maptool.git@{{ simccs_maptool_branch }}#egg=simccs-maptool"
+ editable: true
+ - name: pyjnius
# vhost_servername: "beta.simccs.org"
# Temporary use a *.scigap.org domain name
-vhost_servername: "beta.simccs.scigap.org"
-vhost_ssl: True
# Some of the maptool views call into Java code and can take 2-3 minutes to execute
vhost_timeout: 300
-# sudo certbot --apache certonly -d django.simccs.scigap.org
+vhost_servername: "simccs.js2.scigap.org"
+vhost_ssl: true
ssl_certificate_file: "/etc/letsencrypt/live/{{ vhost_servername }}/cert.pem"
ssl_certificate_chain_file: "/etc/letsencrypt/live/{{ vhost_servername }}/fullchain.pem"
ssl_certificate_key_file: "/etc/letsencrypt/live/{{ vhost_servername }}/privkey.pem"
@@ -66,12 +66,6 @@ gateway_id: "simccs"
experiment_data_dir: "{{ user_data_dir }}/django-simccs"
gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCuylY2GrNiS6ylc4a0qfnNHEUHq9kzCg4yrNmK6O5KTIDN8SdUvVQ9BMx1jPnc9WZEFhvGvUvY1vqM/X0NZ5CS2wXs0LYxucL8Qz1YTJ2p55p0+5ImsaxZa/R4JlAaNeI1IFuR3bgBkjH92KzJha8UFko18md7M72wio1w4Mwq2sCC0g9Iuni04uSSps4BL0hA/lopeRSwzIE0aRT6mVe+vZ73+LfA39e0jJLbcbyhhGUKqUu1YThKo5UIlaz6VMyr0L+NuR5ng21Fyp7C0vdGkOoxIBAX7NcuUnKD6P0rBG7QvzHYTxjGivyjFNE3vjTH40iiSPdQ7nw/+PKpo/C9"
-portal_email_host: "smtp.gmail.com"
-portal_email_port: 587
-portal_email_tls: true
-portal_email_username: "pga.airavata@gmail.com"
-portal_email_password: "{{ vault_portal_email_password }}"
-portal_server_email: "{{ portal_email_username }}"
portal_title: "Indiana Geological Survey"
...
diff --git a/dev-tools/ansible/inventories/scigap/develop/host_vars/simccs/vault.yml b/dev-tools/ansible/inventories/scigap/develop/host_vars/simccs/vault.yml
index b5e26039eb..46a842bdfb 100644
--- a/dev-tools/ansible/inventories/scigap/develop/host_vars/simccs/vault.yml
+++ b/dev-tools/ansible/inventories/scigap/develop/host_vars/simccs/vault.yml
@@ -1,15 +1,12 @@
$ANSIBLE_VAULT;1.1;AES256
-39636663316438373866343935656437613832316430383062363537303530306662666235363738
-3734643739656663366161316238646435333539393533320a393632333035633661386261653739
-36383166343735613561323530323365396533663166386563636462376561303736306630336434
-3434623464656563320a666539656463336265663836396663376364623439313137623262323462
-31303636643930383461633235636237333763633462333234356535633363666364356466343934
-64326361356163396466636130653363383933306336363036643634346463356532356233623366
-31643365393564306331393538326139306332643636326366373431336563363531336437343964
-35373036653464646435333335336666633564643233323265623534633339643865653965373233
-39663831613763666330316236653462626537643735323035383937393730383337393163666166
-36643265633563656162633966666663343363336262353439363966623633383237376431646336
-33386335646565383436373531313331643261363665366633333863643631666662623130623530
-34366336636264353733356462373332323832653737346261393030653938343730636139306332
-32373238633565366330636333356533643663343936346539383534663837323933393238346238
-3433626566643162346166326530646563623464663335633836
+31643137386466393664666162306266313165383938333831653735626366393763613533353935
+3339663839613965353331653263373063366365616538300a343435313038356234356564353637
+32396232336531346430636166613361306134663737326135666238313237343338663431323662
+3735373034633866300a623638333133376332373163313434343131373464313663613566616632
+64666431356532363736313930326239613766373235376533343139643565623936313361326633
+35633363623464336432633930383264323465343935666432363865363138376532643563333635
+35643437653332383131383666313864626136396337373761353439386336313365623466303233
+36333665613434646133646362316164656631633235373461653535663230383331323534373163
+65623430363732333036383561303732666265326661663230613861343536656137656337653137
+31613434623437333539633534666664616233376338346635336662656138653731373063633830
+326637666366613165336566363436393031
diff --git a/dev-tools/ansible/inventories/scigap/develop/host_vars/simvascular/vars.yml b/dev-tools/ansible/inventories/scigap/develop/host_vars/simvascular/vars.yml
index d90ff44d51..55efc2e892 100644
--- a/dev-tools/ansible/inventories/scigap/develop/host_vars/simvascular/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/develop/host_vars/simvascular/vars.yml
@@ -41,12 +41,6 @@ gateway_id: "simvascular"
experiment_data_dir: "{{ user_data_dir }}/simvascular"
# gateway_data_store_ssh_public_key: "TODO"
-portal_email_host: "smtp.gmail.com"
-portal_email_port: 587
-portal_email_tls: true
-portal_email_username: "pga.airavata@gmail.com"
-portal_email_password: "{{ vault_portal_email_password }}"
-portal_server_email: "{{ portal_email_username }}"
portal_title: "Simvascular Gateway"
...
diff --git a/dev-tools/ansible/inventories/scigap/develop/host_vars/simvascular/vault.yml b/dev-tools/ansible/inventories/scigap/develop/host_vars/simvascular/vault.yml
index 8bbf6c3adf..ffe898d61a 100644
--- a/dev-tools/ansible/inventories/scigap/develop/host_vars/simvascular/vault.yml
+++ b/dev-tools/ansible/inventories/scigap/develop/host_vars/simvascular/vault.yml
@@ -1,15 +1,12 @@
$ANSIBLE_VAULT;1.1;AES256
-61323436613762386565623438643831623433663036333865306339313137366531616363363330
-3861663937363732386435663964336534653237363231630a613935333232336539653336623435
-63616438393938626437666339623961366434343961336131353932663131633864663561356136
-3766376563396361340a613265646630633861393866333965313539323838333064666161373064
-38383630313734633935613766383563373132613433346462343931323463643263333264316436
-64396539326339386137386636393538643635623232333933633233303632336666666332663237
-37393032353938323338386566363632386336643639366562646633366534346430366431623838
-35333534313339373736303639383562383239353132653934386665323737633038386133336338
-63316566633330643135653439313330373930646264373766656134376266386265363962626134
-37373836316232666438656538343062626562313235353439646464376536323136303963326430
-63386637396337626630313735323065643362636165303834623938323437656461666638313064
-32623735633330363266386136373131333739623234336235653839623432666365313330656632
-30303564343464383837386465316366663136366366313365643737353530663963353762326134
-6464323030626565353333636530643230306237623135356438
+31366637633264633636663132323938343133386364386530373665656432313165323334623838
+3030383331383939313939366461656263333665643439310a323330303331626131373735613632
+65646631643232373366396635356134623834396338383333383234666135643561656435343934
+6130323038666633300a623562363736363733386138303836383439343531303966663039383537
+30396531313336373763326137323335613537623638626165666462333663343632636261653863
+34313933393331373865336638663163363831633835343265623938356537643236663038636337
+66643336643161306535633239363335663464666238613765616131653265303164383963316331
+32313662666138336263666663656334363665646264336439373764353039636166353533313832
+33613031663439626631613034313566313035646664313632323966316231333931383035303336
+34643261356137363236636563656166616365613339623238626530653335663465386637376135
+313033333164393533396339623163303836
diff --git a/dev-tools/ansible/inventories/scigap/develop/host_vars/usd/vars.yml b/dev-tools/ansible/inventories/scigap/develop/host_vars/usd/vars.yml
index b4a5a24fb9..4dbc8f16e5 100644
--- a/dev-tools/ansible/inventories/scigap/develop/host_vars/usd/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/develop/host_vars/usd/vars.yml
@@ -44,11 +44,5 @@ gateway_id: "usd"
experiment_data_dir: "{{ user_data_dir }}/django-usd"
gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCddtn5FW08tc1anCFYYzD/DqyCFL4prZ0dU+wWBnoxMQOV5vM6yZUKAErmWQOInWQeMDXvznsmyeTcg04FjE+t7xV0NeJ3YEpeayxObOF4oSHTmUAaM+taF+7dSXT+SUgwVOsYaOkCJRVNqkpu1KireN6L2y53j4tmXQTCWgWOQre3a2hLVFqI6JDVVj3Cquq0muSK8wdaYSrwBMwqQ0eJCGPvyhrMNJ/YmADS6GaztZOc+YJGC1jEeKNdrSPV5a8pbHgjZsqjRDDLAeCS5d0kK17P79LUX/Ui1m8wq7HgzWULZPh8zoUYPKjgVjHndB5e6nKsWgLgTyI64Gmy4ETp"
-portal_email_host: "smtp.gmail.com"
-portal_email_port: 587
-portal_email_tls: true
-portal_email_username: "pga.airavata@gmail.com"
-portal_email_password: "{{ vault_portal_email_password }}"
-portal_server_email: "{{ portal_email_username }}"
portal_title: "South Dakota Science Gateway"
...
diff --git a/dev-tools/ansible/inventories/scigap/develop/host_vars/usd/vault.yml b/dev-tools/ansible/inventories/scigap/develop/host_vars/usd/vault.yml
index 1c6393075b..05cba29ad8 100644
--- a/dev-tools/ansible/inventories/scigap/develop/host_vars/usd/vault.yml
+++ b/dev-tools/ansible/inventories/scigap/develop/host_vars/usd/vault.yml
@@ -1,15 +1,12 @@
$ANSIBLE_VAULT;1.1;AES256
-35623363353332386366363266393335366237336565306165323137346666383437323163326133
-3137396533383034366662663466653636366237336332640a373331386233336330363038396438
-31353137366138303061393936383833346165653030393931646438336362616330346138383262
-6664356534373665390a633862643630363961306166626631393934653732316630373963376636
-31326661363839623162373937313862396464353436303733636164323634326337393365383336
-31346535643337623863633634376664333533393164633363303934333861393566326236663331
-62306162653437303930333235636532313866343535623034313162373162393334393166666530
-38356264646666333765336630383837303761666565323063653261626432333431356630306532
-62666264616663343362316536356332323438343061323163386164656133343838383535643936
-38323838353935353231303833376338643837643338633465666365623363623661626635373436
-66383432363162376331386238323738363435333738393932353630316439636134326338646666
-34343737666561663838653434363835383461353961393461666238613630383134666331623833
-66343439636238636366393233363064393637383038303862386662366339333465303333616338
-3266386466323933376563636335343531663366653339653630
+39383033633431393464326236333536623566376466343731396439666237346132653265316236
+3961663334393862346664353930386266336435653438300a363735316662643264386139666238
+39323436333731636535333066613437366538396630353131353862396332376362373961636336
+3162613430353565310a636266663330393939636137383935333436613135646630306235373134
+38376663633433363461616162313637636131353838313463633337316631383434316261303733
+65626639333131306662656162336565646632326434336337633336353537356633653730393164
+65303163376266613636663137363036643831623036306462343739333335643231346565383437
+37353761386336376263353032326364646336303339396239376438373336373765353363623930
+31623834613061303831313531663036666131613532626161623538663561343461313737356532
+62636536663462643133326566383233326538373335656630346234613732386531333664313033
+393132336134633138323462643535633939
diff --git a/dev-tools/ansible/inventories/scigap/develop/hosts b/dev-tools/ansible/inventories/scigap/develop/hosts
index ae562e0aea..1c277b3aba 100644
--- a/dev-tools/ansible/inventories/scigap/develop/hosts
+++ b/dev-tools/ansible/inventories/scigap/develop/hosts
@@ -1,48 +1,43 @@
-# inventory file : scigap develop deployment
+# inventory file : scigap js2 develop deployment
[zookeeper]
-149.165.157.37
+helix.js2.scigap.org ansible_python_interpreter=/usr/bin/python3
[rabbitmq]
-149.165.156.195
+api.js2.scigap.org ansible_python_interpreter=/usr/bin/python3
[database]
-149.165.156.27
+db.js2.scigap.org ansible_python_interpreter=/usr/bin/python3
[api-orch]
-149.165.156.195
-
-[gfac]
-149.165.157.37
-
-[pga]
-149.165.156.46
+api.js2.scigap.org ansible_python_interpreter=/usr/bin/python3
[keycloak]
-149.165.156.151
-
-[django]
-seagrid ansible_host=149.165.156.46
-simvascular ansible_host=149.165.156.46
-simccs ansible_host=149.165.156.46
-interactwel ansible_host=149.165.156.46
-usd ansible_host=149.165.156.46
-csbglsu ansible_host=149.165.156.46
-nexttdb ansible_host=149.165.156.46
-saver-x ansible_host=149.165.156.46
-pfec-hydro ansible_host=149.165.156.46
-cyberwater ansible_host=149.165.156.46
-mines ansible_host=149.165.156.46
-amp ansible_host=149.165.170.199
-geo ansible_host=149.165.156.46
-delta ansible_host=149.165.169.250
-custos-testdrive ansible_host=pgadev.scigap.org
-rnamake ansible_host=149.165.156.46
-
-#149.165.169.129
+iamdev.scigap.org ansible_python_interpreter=/usr/bin/python3 public_ipv4=149.165.152.23
[helix]
-149.165.157.37
+helix.js2.scigap.org ansible_python_interpreter=/usr/bin/python3
[kafka]
-149.165.157.37
+helix.js2.scigap.org ansible_python_interpreter=/usr/bin/python3
+
+[django]
+seagrid ansible_host=web.dev.scigap.org
+; simvascular ansible_host=149.165.156.46
+simccs ansible_host=web.dev.scigap.org
+interactwel ansible_host=web.dev.scigap.org
+; usd ansible_host=149.165.156.46
+; csbglsu ansible_host=149.165.156.46
+; nexttdb ansible_host=149.165.156.46
+; saver-x ansible_host=149.165.156.46
+; pfec-hydro ansible_host=149.165.156.46
+cyberwater ansible_host=web.dev.scigap.org
+; mines ansible_host=149.165.156.46
+amp ansible_host=149.165.153.222
+geo ansible_host=web.dev.scigap.org
+delta ansible_host=149.165.153.181
+; custos-testdrive ansible_host=pgadev.scigap.org
+rnamake ansible_host=web.dev.scigap.org
+
+[pga]
+scigap ansible_host=149.165.155.229
diff --git a/dev-tools/ansible/inventories/scigap/develop/pga_config/scigap/vars.yml b/dev-tools/ansible/inventories/scigap/develop/pga_config/scigap/vars.yml
deleted file mode 100644
index b4e6e44922..0000000000
--- a/dev-tools/ansible/inventories/scigap/develop/pga_config/scigap/vars.yml
+++ /dev/null
@@ -1,57 +0,0 @@
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
----
-pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-pga_git_branch: "develop"
-user: "pga"
-group: "pga"
-doc_root_dir: "/var/www/portals/dev-scigap"
-vhost_servername: "dev.scigap.org"
-vhost_ssl: True
-ssl_certificate_file: "/etc/letsencrypt/live/dev.scigap.org/cert.pem"
-ssl_certificate_chain_file: "/etc/letsencrypt/live/dev.scigap.org/fullchain.pem"
-ssl_certificate_key_file: "/etc/letsencrypt/live/dev.scigap.org/privkey.pem"
-
-## Keycloak related variables
-tenant_domain: "scigap"
-admin_username: "scigap_admin"
-admin_password: "{{ vault_admin_password }}"
-oauth_client_key: "{{ vault_oauth_client_key }}"
-oauth_client_secret: "{{ vault_oauth_client_secret }}"
-oauth_grant_type: "password"
-oidc_discovery_url: "https://iamdev.scigap.org/auth/realms/scigap/.well-known/openid-configuration"
-oauth_callback_url: "https://{{ vhost_servername }}/callback-url"
-initial_role_name: "gateway-provider"
-
-gateway_id: "scigap"
-# relative to document root dir
-experiment_data_dir: "{{ user_data_dir }}/dev-scigap"
-# NOTE: scigap portal doesn't make use of the gateway data store, only used to manage other gateways
-gateway_data_store_resource_id: ""
-
-## Portal related variables
-super_admin_portal: "true"
-admin_emails: "['sgrc-iu-group@iu.edu']"
-portal_email_username: "pga.airavata@gmail.com"
-portal_email_password: "{{ vault_portal_email_password }}"
-portal_theme: "base"
-portal_title: "SciGaP Admin Portal"
-...
diff --git a/dev-tools/ansible/inventories/scigap/develop/pga_config/scigap/vault.yml b/dev-tools/ansible/inventories/scigap/develop/pga_config/scigap/vault.yml
deleted file mode 100644
index 8b3b27474a..0000000000
--- a/dev-tools/ansible/inventories/scigap/develop/pga_config/scigap/vault.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-66643536656361636339616663393332663862623736333263353739396330333833666336663564
-6332613062363366333265376537656436306438343164380a383362623064383237396433353139
-36323038313235323962613864376562386165353365343430306635383131663636616131323962
-6237356432313434660a346364303238343938376437663939363361336666323234366266666161
-65396434313232323463363965623130333637323134653234383962313566323161626535613533
-32303632633137306436356265386533643634663561366131646234343734656161373463653432
-30336132396634343339323466663132313666343631346430643131363939373564383766356266
-36383336373361333139323038623638633130616330313461656566663164353166373466343232
-37346665663566646562356363376638336330353838646634373633646133653163656138373336
-35346434316466616535393332373839636161363038643937616533306433656335373134313036
-63346462623637643461303364353637623166633235373835306338333435656333633731376461
-35643330323064366137383530346234383266363531346265616530306363383463623234623137
-34343637353430373936393766396135383461323832353165393839653236653135613266376236
-30643438316431373566653639353931323030343030303762376431306231336336633131613963
-65656361363961316338373135333864363766616466376539613061663364353937613664393462
-62323562666634653936323837363738316330353163393632376463336165336439306530363139
-3465
diff --git a/dev-tools/ansible/inventories/scigap/develop/pga_config/seagrid/vars.yml b/dev-tools/ansible/inventories/scigap/develop/pga_config/seagrid/vars.yml
deleted file mode 100644
index f512cf21dd..0000000000
--- a/dev-tools/ansible/inventories/scigap/develop/pga_config/seagrid/vars.yml
+++ /dev/null
@@ -1,67 +0,0 @@
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
----
-pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-pga_git_branch: "develop"
-user: "pga"
-group: "pga"
-doc_root_dir: "/var/www/portals/dev-seagrid"
-vhost_servername: "dev.seagrid.org"
-vhost_ssl: True
-# TODO: have Ansible manage these files as well
-ssl_certificate_file: "/etc/letsencrypt/live/dev.seagrid.org/cert.pem"
-ssl_certificate_chain_file: "/etc/letsencrypt/live/dev.seagrid.org/fullchain.pem"
-ssl_certificate_key_file: "/etc/letsencrypt/live/dev.seagrid.org/privkey.pem"
-
-## Keycloak related variables
-tenant_domain: "seagrid"
-admin_username: "admin"
-admin_password: "{{ vault_admin_password }}"
-oauth_client_key: "{{ vault_oauth_client_key }}"
-oauth_client_secret: "{{ vault_oauth_client_secret }}"
-oidc_discovery_url: "https://iamdev.scigap.org/auth/realms/seagrid/.well-known/openid-configuration"
-
-auth_options:
- - name: "SEAGrid"
- oauth_grant_type: "password"
- - name: "existing accounts"
- oauth_grant_type: "authorization_code"
- oauth_authorize_url_extra_params: "kc_idp_hint=oidc"
- logo: "/assets/cilogon-logo-24x24-b.png"
-oauth_callback_url: "https://{{ vhost_servername }}/callback-url"
-
-gateway_id: "seagrid"
-# relative to document root dir
-experiment_data_dir: "{{ user_data_dir }}/dev-seagrid"
-# TODO: Fix the data store resource id
-gateway_data_store_resource_id: "pgadev.scigap.org_7ddf28fd-d503-4ff8-bbc5-3279a7c3b99e"
-gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDWgLve4J9WCohF/4UnbBZsh/nRkP1aM9FmA1FjKwK2gQAnKwhU+NrbsjW38h2Hi+8s9N2oZ9cCJHrvDi2U0cMxz4exIUBcVoRhw37ThlREHADeKR1FbKw0QLhTyfJb0K+1/8GWRluiFx0vHPptJe0KTqu+RJY0NSe+d/BEuGyCZ1hR+SKNuTgcb05Ia6opbSN5D68N9biseEux60d69ARQxLw+VN3Kr/UaBNpGIAfKLlLSUQlTyPA6G6UKCcJZv+/ye10oa0SK0qtrxMpL+4VJcVx+d56U7CUFWKEgPAaQrX1qdGUNDA7HKmD+EBtzw6DJqNJ0Cue/XuPe/RT62tpf"
-group_resource_profile_id: "6a642772-15fd-4d10-a847-8aef89b71830"
-
-## Portal related variables
-super_admin_portal: "false"
-admin_emails: "['sgg@iu.edu','pamidigs@iu.edu', 'eroma.abeysinghe@gmail.com']"
-portal_email_username: "pga.airavata@gmail.com"
-portal_email_password: "{{ vault_portal_email_password }}"
-portal_theme: "seagrid"
-portal_theme_repo: "https://github.com/SciGaP/seagrid-website-theme.git"
-portal_title: "SEAGrid Portal"
-...
diff --git a/dev-tools/ansible/inventories/scigap/develop/pga_config/seagrid/vault.yml b/dev-tools/ansible/inventories/scigap/develop/pga_config/seagrid/vault.yml
deleted file mode 100644
index 4fa5716ddd..0000000000
--- a/dev-tools/ansible/inventories/scigap/develop/pga_config/seagrid/vault.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-35363834376232323532383937363965643066346662646162623433363134396438383566373532
-3166626337666161386532363635386338366439643935310a316430613738343939333932386333
-65313532396532323834346437643366376465393637326137333838366536373438643434653663
-3735333530316164340a626331396161636332663765653465303335306162653232313863303762
-39666330626562646533656639386639653635623735333432386431323532623334313964393732
-65383465353438366438383938393165353235383438636265653731616235613839363566396635
-38653763353363316233373932313638376231366531306462666436353437376139303939343433
-65613532666230366239626132323661646137333031336230343862306534613564623161303066
-62376132666365303632626639643835623465643564393033623866383836323932383533613861
-62363336393361363266323636356164383962343939336432396538373662396264633361353162
-66663935316236316533633134393136356361373936306438333932666662653263613662636166
-62326139646537326334376464303466366563636465343362656131643735626633393835636265
-63343833396434366637626539653536343539383763393234333466623031393634343930393836
-31636136386135336430303035376533343038336662383139653831666230663232616533653461
-61363665633937666162303638366435613838356665613361313730383734383163666537386330
-38386238316366306466346432663139333038353339376336346166393639336137313231356333
-3336
diff --git a/dev-tools/ansible/inventories/scigap/develop/pga_config/simvascular/vars.yml b/dev-tools/ansible/inventories/scigap/develop/pga_config/simvascular/vars.yml
deleted file mode 100644
index 5068a7e58e..0000000000
--- a/dev-tools/ansible/inventories/scigap/develop/pga_config/simvascular/vars.yml
+++ /dev/null
@@ -1,65 +0,0 @@
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
----
-pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-pga_git_branch: "develop"
-user: "pga"
-group: "pga"
-doc_root_dir: "/var/www/portals/pga-simvascular"
-vhost_servername: "beta.simvascular.scigap.org"
-vhost_ssl: True
-# TODO: have Ansible manage these files as well
-ssl_certificate_file: "/etc/letsencrypt/live/beta.simvascular.scigap.org/cert.pem"
-ssl_certificate_chain_file: "/etc/letsencrypt/live/beta.simvascular.scigap.org/fullchain.pem"
-ssl_certificate_key_file: "/etc/letsencrypt/live/beta.simvascular.scigap.org/privkey.pem"
-
-## Keycloak related variables
-tenant_domain: "simvascular"
-admin_username: "admin"
-admin_password: "{{ vault_admin_password }}"
-oauth_client_key: "{{ vault_oauth_client_key }}"
-oauth_client_secret: "{{ vault_oauth_client_secret }}"
-oidc_discovery_url: "https://iamdev.scigap.org/auth/realms/simvascular/.well-known/openid-configuration"
-
-auth_options:
- - name: "SimVascular"
- oauth_grant_type: "password"
- - name: "CILogon"
- oauth_grant_type: "authorization_code"
- oauth_authorize_url_extra_params: "kc_idp_hint=cilogon"
- logo: "/assets/cilogon-logo-24x24-b.png"
-oauth_callback_url: "https://{{ vhost_servername }}/callback-url"
-
-gateway_id: "simvascular"
-# relative to document root dir
-experiment_data_dir: "{{ user_data_dir }}/simvascular"
-gateway_data_store_resource_id: "pgadev.scigap.org_7ddf28fd-d503-4ff8-bbc5-3279a7c3b99e"
-gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDWgLve4J9WCohF/4UnbBZsh/nRkP1aM9FmA1FjKwK2gQAnKwhU+NrbsjW38h2Hi+8s9N2oZ9cCJHrvDi2U0cMxz4exIUBcVoRhw37ThlREHADeKR1FbKw0QLhTyfJb0K+1/8GWRluiFx0vHPptJe0KTqu+RJY0NSe+d/BEuGyCZ1hR+SKNuTgcb05Ia6opbSN5D68N9biseEux60d69ARQxLw+VN3Kr/UaBNpGIAfKLlLSUQlTyPA6G6UKCcJZv+/ye10oa0SK0qtrxMpL+4VJcVx+d56U7CUFWKEgPAaQrX1qdGUNDA7HKmD+EBtzw6DJqNJ0Cue/XuPe/RT62tpf"
-
-## Portal related variables
-super_admin_portal: "false"
-admin_emails: "['sgg@iu.edu','eroma.abeysinghe@gmail.com']"
-portal_email_username: "pga.airavata@gmail.com"
-portal_email_password: "{{ vault_portal_email_password }}"
-portal_theme: "simvascular-gateway-theme"
-portal_theme_repo: "https://github.com/SciGaP/simvascular-gateway-theme.git"
-portal_title: "SimVascular Gateway Portal"
-...
diff --git a/dev-tools/ansible/inventories/scigap/develop/pga_config/simvascular/vault.yml b/dev-tools/ansible/inventories/scigap/develop/pga_config/simvascular/vault.yml
deleted file mode 100644
index a24744d444..0000000000
--- a/dev-tools/ansible/inventories/scigap/develop/pga_config/simvascular/vault.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-39663235396339383266663136613561633834356536323232346264343839636663656366636638
-3562636339363061343532656234303966613261386635620a656433623538643961663866383563
-32366138333464646337316139383230396165393439666439383463326531656365306266326265
-3030646232393538340a356432663330303064363631626666633138313832323332663965393364
-36613764343037346565343632643964306330623136323532343837393362636664663763333437
-65343133313433346538663133326465616465363031643966313963666636303534356437316231
-39663239316133383035383239303731306163373362353164396364653964353533623633646335
-61386464646132353939373761383037343637616133626665383330366636643537356163323962
-66663938666166373830646136333265323561363036336236663964623662356639623866376137
-36336537633836313839633737393435666537386463343862333235663961653437303462383930
-65383762666536393732613466393763373434383661356337306539613766356138353033613530
-34613938613237663662333064616664666138333435363835346434316161663933386335303438
-39343437346665326334336537316264656265313663623331626339323933383064343539326439
-35666133373639356261353166353332663936643433386539373533313832336164373466386331
-32616138303838353431316239376630383437373466663463323230306532353632656231313230
-36343532363965306333646161663638366364643131303135653239663264623366653933343538
-3266
diff --git a/dev-tools/ansible/inventories/scigap/develop/pga_config/testdrive/vars.yml b/dev-tools/ansible/inventories/scigap/develop/pga_config/testdrive/vars.yml
deleted file mode 100644
index e1b0034736..0000000000
--- a/dev-tools/ansible/inventories/scigap/develop/pga_config/testdrive/vars.yml
+++ /dev/null
@@ -1,65 +0,0 @@
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
----
-pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-pga_git_branch: "develop"
-user: "pga"
-group: "pga"
-doc_root_dir: "/var/www/portals/dev-testdrive"
-vhost_servername: "dev.testdrive.airavata.org"
-vhost_ssl: True
-ssl_certificate_file: "/etc/letsencrypt/live/dev.testdrive.airavata.org/cert.pem"
-ssl_certificate_chain_file: "/etc/letsencrypt/live/dev.testdrive.airavata.org/fullchain.pem"
-ssl_certificate_key_file: "/etc/letsencrypt/live/dev.testdrive.airavata.org/privkey.pem"
-
-## Keycloak related variables
-tenant_domain: "{{ gateway_id }}"
-admin_username: "admin"
-admin_password: "{{ vault_admin_password }}"
-oauth_client_key: "{{ vault_oauth_client_key }}"
-oauth_client_secret: "{{ vault_oauth_client_secret }}"
-oidc_discovery_url: "https://iamdev.scigap.org/auth/realms/{{ tenant_domain }}/.well-known/openid-configuration"
-
-auth_options:
- - name: "Test Drive"
- oauth_grant_type: "password"
- - name: "CILogon"
- oauth_grant_type: "authorization_code"
- oauth_authorize_url_extra_params: "kc_idp_hint=cilogon"
- logo: "/assets/cilogon-logo-24x24-b.png"
-oauth_callback_url: "https://{{ vhost_servername }}/callback-url"
-
-gateway_id: "default"
-# relative to document root dir
-experiment_data_dir: "{{ user_data_dir }}/dev-testdrive"
-gateway_data_store_resource_id: "pgadev.scigap.org_7ddf28fd-d503-4ff8-bbc5-3279a7c3b99e"
-gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCEK6v8oMNUKDqQtlHlXRUpRZVqCL6CbQlJTL5QajevPFtvM0hauS/Rjj6M/bjgTfRyef2/E100l1pH3xhFuL65+OTnOZgC5DQ0T3J1OtldTTuP1Rl7mKZR4xKYzx/hxSgB6kn8tZb3IgDCYnHNcTLYGj1rEpNEO6ju8e9qVR02ex+hbC+4Q4bJgX6FxHL4+rQHcqT6I1k3JmwRsPzr3P1hiRgUUkxAlQuXFXsoa4+9BzEU5D0qXq0o/Q12jKOhPwWyOyhV2X++bc50VKkm0G6M6n78OL8CBIKmZyczgEwD2zB9gx3aTHXTEgUqaVHyOMc3aE8Kt1Us33PDyXpn8sk3"
-group_resource_profile_id: "1cee1887-6774-49c4-9f3c-edfc3558cf9b"
-
-## Portal related variables
-super_admin_portal: "false"
-admin_emails: "['sgg@iu.edu']"
-portal_email_username: "pga.airavata@gmail.com"
-portal_email_password: "{{ vault_portal_email_password }}"
-portal_theme: "base"
-#portal_theme_repo: "https://github.com/SciGaP/seagrid-website-theme.git"
-portal_title: "Airavata Test Drive"
-...
diff --git a/dev-tools/ansible/inventories/scigap/develop/pga_config/testdrive/vault.yml b/dev-tools/ansible/inventories/scigap/develop/pga_config/testdrive/vault.yml
deleted file mode 100644
index 59eb48fc75..0000000000
--- a/dev-tools/ansible/inventories/scigap/develop/pga_config/testdrive/vault.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-37653330653661316166336135653863643435656234363935346436646433353061613333376462
-3031393162356336393430333763663764633263353637310a386662313137383733333666396539
-39313331373262323031613561633835663266386663613037393235366533333130303438306564
-3631313831323765630a653331363766343836326135393131646264613361646266333662666663
-34336561356230623239613237393161616263333638613765616134633837393161393933643433
-61383030316464633961313965653365373037326234636234306661346234316630656634626264
-32666265633261666330623262303462643932336463303231303935643936613638326363363262
-39363237353038626437646230623565353038383566303662663033623066383938656530613939
-39343339643062313830633165323135346330636133663632366436336263363232646431663239
-32663434333032353632373735333434613066386132646561643930626466306433623639386266
-33313366383036313161373736656530366339646333373664333364373531633463333838303334
-39626330646361636238303261343164343834623065393131646336306430383331333364313937
-37333539303361386234663930613130363564333232326535313864306132646361353132393638
-31343338636466353338656261633437616330636631326564353032393162383465343137383163
-61666265336465366263636435336436343764356133653963653866353166356138353837346434
-35326265666365393963356231313964333763316464633636656332653132633931393064626630
-3966