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/14 14:59:29 UTC
[airavata] branch master updated (c33ed35 -> 91a575e)
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 c33ed35 Ansible: fixing Delta configuration
new 050f4b8 AIRAVATA-3274 Run webserver setup only once per server
new 91a575e Ansible: fixing delta config
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:
dev-tools/ansible/django.yml | 19 +++++++++++++------
dev-tools/ansible/inventories/scigap/production/hosts | 3 ---
2 files changed, 13 insertions(+), 9 deletions(-)
[airavata] 02/02: Ansible: fixing delta config
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 91a575e96dd2f95bcdc9f193650d66977547bc1d
Author: Marcus Christie <ma...@iu.edu>
AuthorDate: Thu Nov 14 09:56:30 2019 -0500
Ansible: fixing delta config
---
dev-tools/ansible/inventories/scigap/production/hosts | 3 ---
1 file changed, 3 deletions(-)
diff --git a/dev-tools/ansible/inventories/scigap/production/hosts b/dev-tools/ansible/inventories/scigap/production/hosts
index 8d3ee5f..a556896 100644
--- a/dev-tools/ansible/inventories/scigap/production/hosts
+++ b/dev-tools/ansible/inventories/scigap/production/hosts
@@ -24,9 +24,6 @@ gf4.ucs.indiana.edu ansible_user=root
[keycloak]
gf7.ucs.indiana.edu ansible_user=root
-# Delta Jetstream server
-delta ansible_host=149.165.169.250 ansible_user=centos
-
[django]
ampgateway ansible_host=156.56.104.84
csbglsu ansible_host=156.56.104.84
[airavata] 01/02: AIRAVATA-3274 Run webserver setup only once per
server
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 050f4b811929137645e5ed938edb89cf6e40b3dd
Author: Marcus Christie <ma...@iu.edu>
AuthorDate: Thu Nov 14 09:36:54 2019 -0500
AIRAVATA-3274 Run webserver setup only once per server
---
dev-tools/ansible/django.yml | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
diff --git a/dev-tools/ansible/django.yml b/dev-tools/ansible/django.yml
index ed343a4..cdd26ae 100644
--- a/dev-tools/ansible/django.yml
+++ b/dev-tools/ansible/django.yml
@@ -19,15 +19,22 @@
#
---
-# Run the following setup once
-- hosts: django[0]
+# Run the following setup once per server (each server can have one or more Django vhosts)
+- hosts: django
+ tasks:
+ - group_by: key=django_{{ ansible_hostname }}
+- hosts: django
name: webserver setup
roles:
- - env_setup
+ - role: env_setup
+ when: inventory_hostname == groups['django_' + ansible_hostname][0]
# Oracle JDK is needed by Django apps that call Java code (e.g., SimCCS Maptool)
- - java
- - httpd
- - letsencrypt
+ - role: java
+ when: inventory_hostname == groups['django_' + ansible_hostname][0]
+ - role: httpd
+ when: inventory_hostname == groups['django_' + ansible_hostname][0]
+ - role: letsencrypt
+ when: inventory_hostname == groups['django_' + ansible_hostname][0]
# Create a django virtual host
- hosts: django