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 2017/04/04 20:43:43 UTC
airavata git commit: Various fixes for gf{5,6} environment
Repository: airavata
Updated Branches:
refs/heads/master 382e3cb48 -> 749a84d9b
Various fixes for gf{5,6} environment
Added email addresses to gfac-config.yml to master current production.
gf{5,6} don't have an eth0 interface so I made that part more generic.
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/749a84d9
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/749a84d9
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/749a84d9
Branch: refs/heads/master
Commit: 749a84d9b31383fb839ad71617b5d31425e65006
Parents: 382e3cb
Author: Marcus Christie <ma...@apache.org>
Authored: Tue Apr 4 16:41:17 2017 -0400
Committer: Marcus Christie <ma...@apache.org>
Committed: Tue Apr 4 16:41:17 2017 -0400
----------------------------------------------------------------------
.../scigap/production/group_vars/all/vars.yml | 15 ++++++++++-----
dev-tools/ansible/roles/api-orch/tasks/main.yml | 9 ++++++---
.../roles/api-orch/templates/gfac-config.yaml.j2 | 6 ++++++
dev-tools/ansible/roles/gfac/tasks/main.yml | 2 +-
.../ansible/roles/gfac/templates/gfac-config.yaml.j2 | 6 ++++++
5 files changed, 29 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/749a84d9/dev-tools/ansible/inventories/scigap/production/group_vars/all/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/group_vars/all/vars.yml b/dev-tools/ansible/inventories/scigap/production/group_vars/all/vars.yml
index a6f6547..ecc6641 100644
--- a/dev-tools/ansible/inventories/scigap/production/group_vars/all/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/group_vars/all/vars.yml
@@ -64,7 +64,7 @@ zookeeper_url: "{{ groups['zookeeper'][0] }}:{{ zookeeper_client_port }}"
# API Server related variables
api_server_name: "apiserver-node0"
-api_server_host: "{{ansible_fqdn}}"
+api_server_host: "{{ groups['api-orch'][0] }}"
api_server_port: "8930"
api_secured: "true"
tls_enable: "true"
@@ -73,13 +73,13 @@ enable_sharing: "true"
# Orchestrator related variables
orchestrator_name: "orchestrator-node0"
-orchestrator_host: "{{ansible_fqdn}}"
+orchestrator_host: "{{ groups['api-orch'][0] }}"
orchestrator_port: "8940"
api_orch_dir: "{{ deployment_dir }}/api-orchestrator"
# registry related variables
registry_name: regserver-node0
-registry_host: "{{groups['registry'][0]}}"
+registry_host: "{{ groups['api-orch'][0] }}"
registry_port: 8970
#registry_dir: "{{ deployment_dir }}/registry"
default_gateway: "default"
@@ -94,13 +94,13 @@ 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: "{{ ansible_fqdn }}"
+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: "{{ ansible_fqdn }}"
+gfac_host: "{{ groups['gfac'][0] }}"
gfac_port: "8950"
gfac_dir: "{{ deployment_dir }}/gfac-instance"
@@ -110,3 +110,8 @@ monitor_email_password: "{{ vault_monitor_email_password }}"
# PGA variables
pga_repo: "https://github.com/apache/airavata-php-gateway.git"
+user_data_dir: "/var/www/portals/gateway-user-data"
+
+# Sharing Registry related variables
+sharing_registry_host: "{{ groups['api-orch'][0] }}"
+sharing_registry_port: 7878
http://git-wip-us.apache.org/repos/asf/airavata/blob/749a84d9/dev-tools/ansible/roles/api-orch/tasks/main.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/api-orch/tasks/main.yml b/dev-tools/ansible/roles/api-orch/tasks/main.yml
index 4063c67..561b78f 100644
--- a/dev-tools/ansible/roles/api-orch/tasks/main.yml
+++ b/dev-tools/ansible/roles/api-orch/tasks/main.yml
@@ -45,9 +45,11 @@
- name: set api-orch private ip
set_fact:
- api_server_host: "{{ ansible_eth0.ipv4.address }}"
- orchestrator_host: "{{ ansible_eth0.ipv4.address }}"
- cred_store_server_host: "{{ ansible_eth0.ipv4.address }}"
+ api_server_host: "{{ ansible_default_ipv4.address }}"
+ orchestrator_host: "{{ ansible_default_ipv4.address }}"
+ cred_store_server_host: "{{ ansible_default_ipv4.address }}"
+ registry_host: "{{ ansible_default_ipv4.address }}"
+ sharing_registry_host: "{{ ansible_default_ipv4.address }}"
- name: Copy Airavata server properties file
@@ -76,6 +78,7 @@
- "{{ api_server_port }}/tcp"
- "{{ orchestrator_port }}/tcp"
- "{{ cred_store_port }}/tcp"
+ - "{{ registry_port }}/tcp"
become_user: root
- name: stop api-orch
http://git-wip-us.apache.org/repos/asf/airavata/blob/749a84d9/dev-tools/ansible/roles/api-orch/templates/gfac-config.yaml.j2
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/api-orch/templates/gfac-config.yaml.j2 b/dev-tools/ansible/roles/api-orch/templates/gfac-config.yaml.j2
index 3df5832..ba18caa 100644
--- a/dev-tools/ansible/roles/api-orch/templates/gfac-config.yaml.j2
+++ b/dev-tools/ansible/roles/api-orch/templates/gfac-config.yaml.j2
@@ -94,18 +94,24 @@ resources:
- SDSC Admin <sl...@comet-fe4.sdsc.edu> # comet new
- Slurm <sl...@psc.edu> # bridges
- Slurm Daemon <sl...@odin.oscer.ou.edu> # OU Schooner
+ - slurm@lnet28.stampede.tacc.utexas.edu # stampede2
+ - Slurm service account <sl...@chpc.utah.edu> # Utah Ember
- jobManagerType: UGE
commandOutputParser: org.apache.airavata.gfac.impl.job.UGEOutputParser
emailParser: org.apache.airavata.gfac.monitor.email.parser.UGEEmailParser
resourceEmailAddresses:
- ls4.tacc.utexas.edu # contain Lonestar
+ - root <ro...@local> # USD HPC Cluster
+ - root <li...@siu.edu> # SIU Little Dog
+
- jobManagerType: LSF
commandOutputParser: org.apache.airavata.gfac.impl.job.LSFOutputParser
emailParser: org.apache.airavata.gfac.monitor.email.parser.LSFEmailParser
resourceEmailAddresses:
- iu.xsede.edu # test resource mail address
+ - tcs.tulsahpc.org #Tandy
- jobManagerType: FORK
commandOutputParser: org.apache.airavata.gfac.impl.job.ForkOutputParser
http://git-wip-us.apache.org/repos/asf/airavata/blob/749a84d9/dev-tools/ansible/roles/gfac/tasks/main.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/gfac/tasks/main.yml b/dev-tools/ansible/roles/gfac/tasks/main.yml
index 5ce43a0..d5de2c6 100644
--- a/dev-tools/ansible/roles/gfac/tasks/main.yml
+++ b/dev-tools/ansible/roles/gfac/tasks/main.yml
@@ -46,7 +46,7 @@
- name: set gfac private ip
set_fact:
- gfac_host: "{{ ansible_eth0.ipv4.address }}"
+ gfac_host: "{{ ansible_default_ipv4.address }}"
- name: Copy Airavata server properties file
template: src=airavata-server.properties.j2
http://git-wip-us.apache.org/repos/asf/airavata/blob/749a84d9/dev-tools/ansible/roles/gfac/templates/gfac-config.yaml.j2
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/gfac/templates/gfac-config.yaml.j2 b/dev-tools/ansible/roles/gfac/templates/gfac-config.yaml.j2
index 3df5832..ba18caa 100644
--- a/dev-tools/ansible/roles/gfac/templates/gfac-config.yaml.j2
+++ b/dev-tools/ansible/roles/gfac/templates/gfac-config.yaml.j2
@@ -94,18 +94,24 @@ resources:
- SDSC Admin <sl...@comet-fe4.sdsc.edu> # comet new
- Slurm <sl...@psc.edu> # bridges
- Slurm Daemon <sl...@odin.oscer.ou.edu> # OU Schooner
+ - slurm@lnet28.stampede.tacc.utexas.edu # stampede2
+ - Slurm service account <sl...@chpc.utah.edu> # Utah Ember
- jobManagerType: UGE
commandOutputParser: org.apache.airavata.gfac.impl.job.UGEOutputParser
emailParser: org.apache.airavata.gfac.monitor.email.parser.UGEEmailParser
resourceEmailAddresses:
- ls4.tacc.utexas.edu # contain Lonestar
+ - root <ro...@local> # USD HPC Cluster
+ - root <li...@siu.edu> # SIU Little Dog
+
- jobManagerType: LSF
commandOutputParser: org.apache.airavata.gfac.impl.job.LSFOutputParser
emailParser: org.apache.airavata.gfac.monitor.email.parser.LSFEmailParser
resourceEmailAddresses:
- iu.xsede.edu # test resource mail address
+ - tcs.tulsahpc.org #Tandy
- jobManagerType: FORK
commandOutputParser: org.apache.airavata.gfac.impl.job.ForkOutputParser