[airavata] 10/10: Merge branch 'AIRAVATA-3609-develop-inventory' into develop

[ma...@apache.org]

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

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

commit c02b3a56749d7f0d970dbb98ea1c419271da155e
Merge: 834c381b1b 7ac5d08b51
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Wed Jul 27 09:34:55 2022 -0400

    Merge branch 'AIRAVATA-3609-develop-inventory' into develop

 .../scigap/develop-js2/group_vars/all/vars.yml         |  5 ++++-
 .../scigap/develop-js2/group_vars/django/vars.yml      | 11 +++++++----
 .../scigap/develop-js2/host_vars/amp/vars.yml          |  3 ++-
 .../scigap/develop-js2/host_vars/geo/vars.yml          | 18 ++++++++----------
 .../scigap/develop-js2/host_vars/interactwel/vars.yml  | 15 ++++++---------
 .../scigap/develop-js2/host_vars/rnamake/vars.yml      | 10 ++++------
 .../scigap/develop-js2/host_vars/seagrid/vars.yml      | 10 +++++-----
 .../scigap/develop-js2/host_vars/simccs/vars.yml       | 12 ++++++------
 dev-tools/ansible/inventories/scigap/develop-js2/hosts | 18 ++++++++++++++++++
 9 files changed, 60 insertions(+), 42 deletions(-)

diff --cc dev-tools/ansible/inventories/scigap/develop-js2/group_vars/all/vars.yml
index e979e5a128,28517bab67..3b28cfcc39
--- 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
@@@ -232,5 -235,3 +235,5 @@@ monitoring_subnets: "{{ iu_subnets }}
  
  # Zabbix
  zabbix_server: "rt-watch.uits.indiana.edu"
 +
- letsencrypt_email: "circ-iu-group@iu.edu"
++letsencrypt_email: "circ-iu-group@iu.edu"
diff --cc dev-tools/ansible/inventories/scigap/develop-js2/hosts
index c86d67547c,dbd2d81439..fdb0628370
--- a/dev-tools/ansible/inventories/scigap/develop-js2/hosts
+++ b/dev-tools/ansible/inventories/scigap/develop-js2/hosts
@@@ -1,22 -1,40 +1,40 @@@
  # inventory file : scigap js2 develop deployment
  
  [zookeeper]
 -helix.js2.scigap.org
 +helix.js2.scigap.org ansible_python_interpreter=/usr/bin/python3
  
  [rabbitmq]
 -api.js2.scigap.org
 +api.js2.scigap.org ansible_python_interpreter=/usr/bin/python3
  
  [database]
 -db.js2.scigap.org ansible_user=exouser
 +db.js2.scigap.org ansible_python_interpreter=/usr/bin/python3
  
  [api-orch]
 -api.js2.scigap.org
 +api.js2.scigap.org ansible_python_interpreter=/usr/bin/python3
  
  [keycloak]
 -iam.js2.scigap.org ansible_user=exouser
 +iam.js2.scigap.org ansible_python_interpreter=/usr/bin/python3
  
  [helix]
 -helix.js2.scigap.org
 +helix.js2.scigap.org ansible_python_interpreter=/usr/bin/python3
  
  [kafka]
 -helix.js2.scigap.org
 +helix.js2.scigap.org ansible_python_interpreter=/usr/bin/python3
+ 
+ [django]
 -seagrid ansible_host=web.dev.scigap.org ansible_user=exouser
++seagrid ansible_host=web.dev.scigap.org
+ ; simvascular ansible_host=149.165.156.46
 -simccs ansible_host=web.dev.scigap.org ansible_user=exouser
 -interactwel ansible_host=web.dev.scigap.org ansible_user=exouser
++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=149.165.156.46
+ ; mines ansible_host=149.165.156.46
+ ; amp ansible_host=149.165.170.199
 -geo ansible_host=web.dev.scigap.org ansible_user=exouser
++geo ansible_host=web.dev.scigap.org
+ ; delta ansible_host=149.165.169.250
+ ; custos-testdrive ansible_host=pgadev.scigap.org
 -rnamake ansible_host=web.dev.scigap.org ansible_user=exouser
++rnamake ansible_host=web.dev.scigap.org