[airavata] 02/02: futurewater production inventory

[ma...@apache.org]

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

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

commit 449b75813188fdb31f0aa2866ca45b9200e51b17
Author: Marcus Christie <ma...@iu.edu>
AuthorDate: Sun Nov 3 18:30:50 2019 -0500

    futurewater production inventory
---
 .../inventories/scigap/pfec-hydro-production/hosts |  3 ---
 .../host_vars/futurewater/vars.yml                 | 22 ++--------------------
 .../host_vars/futurewater/vault.yml                |  0
 .../ansible/inventories/scigap/production/hosts    |  2 ++
 4 files changed, 4 insertions(+), 23 deletions(-)

diff --git a/dev-tools/ansible/inventories/scigap/pfec-hydro-production/hosts b/dev-tools/ansible/inventories/scigap/pfec-hydro-production/hosts
index d329701..ba6cf3b 100644
--- a/dev-tools/ansible/inventories/scigap/pfec-hydro-production/hosts
+++ b/dev-tools/ansible/inventories/scigap/pfec-hydro-production/hosts
@@ -10,6 +10,3 @@ scigap02.sciencegateways.iu.edu ansible_user=root
 [pga]
 # Hosted on Jetstream
 149.165.171.92 ansible_user=centos
-
-[django]
-futurewater ansible_host=149.165.171.92 ansible_user=centos
diff --git a/dev-tools/ansible/inventories/scigap/pfec-hydro-production/host_vars/futurewater/vars.yml b/dev-tools/ansible/inventories/scigap/production/host_vars/futurewater/vars.yml
similarity index 77%
rename from dev-tools/ansible/inventories/scigap/pfec-hydro-production/host_vars/futurewater/vars.yml
rename to dev-tools/ansible/inventories/scigap/production/host_vars/futurewater/vars.yml
index 5b6ec9b..a18ff7d 100644
--- a/dev-tools/ansible/inventories/scigap/pfec-hydro-production/host_vars/futurewater/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/host_vars/futurewater/vars.yml
@@ -20,31 +20,13 @@
 
 ---
 
-user: "pga"
-group: "pga"
+# NOTE: futurewater is deployed to a Jetstream VM
+
 gateway_data_store_hostname: "gateway.futurewater.indiana.edu"
 gateway_data_store_resource_id: "js-171-92.jetstream-cloud.org_1a76397d-cc28-4ec9-82e8-d27c5cf80c79"
-django_wsgi_processes: 2
-doc_root_dir: "/var/www/portals/django-{{gateway_id}}"
-django_database_name: "django_{{ inventory_hostname }}"
-django_db_username: "django"
-django_db_password: "{{ vault_db_password }}"
-django_hidden_airavata_apps: "['django_airavata_dataparsers']"
 # TODO change
 # django_tus_endpoint: "https://tus.staging.scigap.org/files/"
 
-# Default email settings
-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 }}"
-
-django_error_emails: "[('SciGaP Errors', 'bugs@scigap.org')]"
-
-airavata_django_repo: "https://github.com/apache/airavata-django-portal.git"
-
 vhost_servername: "django.futurewater.scigap.org"
 vhost_ssl: True
 ssl_certificate_file: "/etc/letsencrypt/live/django.futurewater.scigap.org/cert.pem"
diff --git a/dev-tools/ansible/inventories/scigap/pfec-hydro-production/host_vars/futurewater/vault.yml b/dev-tools/ansible/inventories/scigap/production/host_vars/futurewater/vault.yml
similarity index 100%
rename from dev-tools/ansible/inventories/scigap/pfec-hydro-production/host_vars/futurewater/vault.yml
rename to dev-tools/ansible/inventories/scigap/production/host_vars/futurewater/vault.yml
diff --git a/dev-tools/ansible/inventories/scigap/production/hosts b/dev-tools/ansible/inventories/scigap/production/hosts
index bc7c3ed..cba6768 100644
--- a/dev-tools/ansible/inventories/scigap/production/hosts
+++ b/dev-tools/ansible/inventories/scigap/production/hosts
@@ -59,3 +59,5 @@ wvsu ansible_host=156.56.104.84
 # dreg jetstream server
 dreg ansible_host=149.165.156.72 ansible_user=centos
 
+# futurewater jetstream server
+futurewater ansible_host=149.165.171.92 ansible_user=centos