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 2019/11/04 00:31:17 UTC
[airavata] branch master updated (f0d94cd -> 449b758)
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/airavata.git.
from f0d94cd Exclude .git directory in built Django code
new fd3d04e Updating dreg inventory
new 449b758 futurewater production inventory
The 2 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/dreg-production/group_vars/pga/vars.yml | 2 ++
.../inventories/scigap/dreg-production/hosts | 3 ---
.../inventories/scigap/pfec-hydro-production/hosts | 3 ---
.../host_vars/dreg/vars.yml | 25 ++++------------------
.../host_vars/dreg/vault.yml | 0
.../host_vars/futurewater/vars.yml | 22 ++-----------------
.../host_vars/futurewater/vault.yml | 0
.../ansible/inventories/scigap/production/hosts | 5 +++++
8 files changed, 13 insertions(+), 47 deletions(-)
rename dev-tools/ansible/inventories/scigap/{dreg-production => production}/host_vars/dreg/vars.yml (73%)
rename dev-tools/ansible/inventories/scigap/{dreg-production => production}/host_vars/dreg/vault.yml (100%)
rename dev-tools/ansible/inventories/scigap/{pfec-hydro-production => production}/host_vars/futurewater/vars.yml (77%)
rename dev-tools/ansible/inventories/scigap/{pfec-hydro-production => production}/host_vars/futurewater/vault.yml (100%)
[airavata] 01/02: Updating dreg inventory
Posted by 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 fd3d04e20142840e6da21bd87f1efa5e1d68be95
Author: Marcus Christie <ma...@iu.edu>
AuthorDate: Sun Nov 3 18:04:02 2019 -0500
Updating dreg inventory
---
.../scigap/dreg-production/group_vars/pga/vars.yml | 2 ++
.../inventories/scigap/dreg-production/hosts | 3 ---
.../host_vars/dreg/vars.yml | 25 ++++------------------
.../host_vars/dreg/vault.yml | 0
.../ansible/inventories/scigap/production/hosts | 3 +++
5 files changed, 9 insertions(+), 24 deletions(-)
diff --git a/dev-tools/ansible/inventories/scigap/dreg-production/group_vars/pga/vars.yml b/dev-tools/ansible/inventories/scigap/dreg-production/group_vars/pga/vars.yml
index 34e596b..fa3b4a5 100644
--- a/dev-tools/ansible/inventories/scigap/dreg-production/group_vars/pga/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/dreg-production/group_vars/pga/vars.yml
@@ -72,4 +72,6 @@ portal_email_password: "{{ vault_portal_email_password }}"
portal_theme: "dreg"
portal_title: "dREG DNA Sequencing"
pga_google_analytics_id: "UA-111528347-3"
+pga_airavata_django_url: "https://django.dreg.scigap.org"
+pga_reroute_to_django: true
...
diff --git a/dev-tools/ansible/inventories/scigap/dreg-production/hosts b/dev-tools/ansible/inventories/scigap/dreg-production/hosts
index 827e6d2..17bfc20 100644
--- a/dev-tools/ansible/inventories/scigap/dreg-production/hosts
+++ b/dev-tools/ansible/inventories/scigap/dreg-production/hosts
@@ -10,6 +10,3 @@ scigap02.sciencegateways.iu.edu ansible_user=root
[pga]
# Hosted on Jetstream
149.165.156.72 ansible_user=centos
-
-[django]
-dreg ansible_host=149.165.156.72 ansible_user=centos
diff --git a/dev-tools/ansible/inventories/scigap/dreg-production/host_vars/dreg/vars.yml b/dev-tools/ansible/inventories/scigap/production/host_vars/dreg/vars.yml
similarity index 73%
rename from dev-tools/ansible/inventories/scigap/dreg-production/host_vars/dreg/vars.yml
rename to dev-tools/ansible/inventories/scigap/production/host_vars/dreg/vars.yml
index ff72082..8748fd8 100644
--- a/dev-tools/ansible/inventories/scigap/dreg-production/host_vars/dreg/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/host_vars/dreg/vars.yml
@@ -19,31 +19,14 @@
#
---
-user: "pga"
-group: "pga"
+
+# NOTE: dreg is deployed on a Jetstream server
+
gateway_data_store_hostname: "dreg.dnasequence.org"
gateway_data_store_resource_id: "js-156-72.jetstream-cloud.org_758cf5c0-71f4-4268-bb42-5ede23cfeea9"
-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"
-airavata_django_git_branch: "master"
# airavata_django_extra_dependencies:
# - git+https://github.com/SciGaP/dreg-djangoapp.git@gbrowser#egg=dreg-djangoapp
@@ -67,7 +50,7 @@ gateway_id: "cornelldna"
experiment_data_dir: "{{ user_data_dir }}/cornelldna"
gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCTs6k2lSt5nn+UF3N1rAko9WjdtHZ1xLcKxCG4+4AVMdTIeng12g+1qB5hIFiDgesT/D/nzoA27EFj5nWiYanxBySNgl1Re8kR0nEqQbR0zj1dSibmfjW+vmOZzEiNSrNoLlc4KbFgqFCRGIlZ1bWZ7yHtJ3I7xxfKhvvxCTzJ4K71v1aovnDTUYophy2lUsdOcOq84Qhv3ITZafgblz3mJSwVpnnI72IepzonzDUdcf/w0lKCl70L9MgQAZ2V4e9sQZWJLI5s1VtJsqKggtgI4goPyxXROoH9PTUZFqvvYjLGW8JVS9eZKblSKil09yckPfZCSk1i/UD/uY6O7bjf"
-admin_emails: "[('SGRC', 'sgrc-iu-group@iu.edu')]"
+admin_emails: "[('Zhong Wang', 'zw355@cornell.edu'), ('SGRC', 'sgrc-iu-group@iu.edu')]"
portal_title: "dREG Portal"
...
diff --git a/dev-tools/ansible/inventories/scigap/dreg-production/host_vars/dreg/vault.yml b/dev-tools/ansible/inventories/scigap/production/host_vars/dreg/vault.yml
similarity index 100%
rename from dev-tools/ansible/inventories/scigap/dreg-production/host_vars/dreg/vault.yml
rename to dev-tools/ansible/inventories/scigap/production/host_vars/dreg/vault.yml
diff --git a/dev-tools/ansible/inventories/scigap/production/hosts b/dev-tools/ansible/inventories/scigap/production/hosts
index 766c8a4..bc7c3ed 100644
--- a/dev-tools/ansible/inventories/scigap/production/hosts
+++ b/dev-tools/ansible/inventories/scigap/production/hosts
@@ -56,3 +56,6 @@ testdrive ansible_host=156.56.104.84
uab ansible_host=156.56.104.84
wvsu ansible_host=156.56.104.84
+# dreg jetstream server
+dreg ansible_host=149.165.156.72 ansible_user=centos
+
[airavata] 02/02: futurewater production inventory
Posted by 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