This is an automated email from the ASF dual-hosted git repository.
dimuthuupe pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata.git
The following commit(s) were added to refs/heads/master by this push:
new 1b2e96a Updating ansibles to compatible with new distributions
1b2e96a is described below
commit 1b2e96ab76ddff2ce0648aaf345375bd814797c6
Author: Dimuthu Wannipurage <[email protected]>
AuthorDate: Tue Apr 30 15:40:04 2019 -0400
Updating ansibles to compatible with new distributions
---
.../scigap/testing/group_vars/all/vars.yml | 13 +--
dev-tools/ansible/roles/api-orch/tasks/main.yml | 7 --
.../roles/api-orch/templates/gfac-config.yaml.j2 | 117 ---------------------
.../ansible/roles/helix_setup/defaults/main.yml | 8 +-
dev-tools/ansible/roles/helix_setup/tasks/main.yml | 2 +-
.../ansible/roles/job_monitor/defaults/main.yml | 4 +-
dev-tools/ansible/roles/job_monitor/tasks/main.yml | 2 +-
7 files changed, 10 insertions(+), 143 deletions(-)
diff --git
a/dev-tools/ansible/inventories/scigap/testing/group_vars/all/vars.yml
b/dev-tools/ansible/inventories/scigap/testing/group_vars/all/vars.yml
index 562d3ff..03108ef 100644
--- a/dev-tools/ansible/inventories/scigap/testing/group_vars/all/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/testing/group_vars/all/vars.yml
@@ -30,10 +30,9 @@ user_home: "/home/{{ user }}"
deployment_dir: "{{ user_home }}/staging-deployment"
airavata_source_dir: "{{ user_home }}/staging-source"
airavata_repo: "https://github.com/apache/airavata.git";
-airavata_dist: "apache-airavata-server-0.18-SNAPSHOT"
+airavata_dist: "apache-airavata-api-server-0.18-SNAPSHOT"
airavata_dist_name: "{{ airavata_dist }}-bin.tar.gz"
-old_airavata_dist: "apache-airavata-server-0.17-SNAPSHOT"
-git_branch: staging
+git_branch: master
# Database related variables
db_server: "{{
hostvars[groups['database'][0]]['ansible_default_ipv4']['address'] }}"
@@ -99,13 +98,6 @@ 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: "{{ groups['gfac'][0] }}"
-#gfac_port: "8950"
-#gfac_dir: "{{ deployment_dir }}/gfac-instance"
-#gfac_log_dir: "{{ gfac_dir }}/logs"
-
# Monitoring variables
monitor_email_address: "[email protected]"
monitor_email_password: "{{ vault_monitor_email_password }}"
@@ -115,7 +107,6 @@ pga_repo:
"https://github.com/apache/airavata-php-gateway.git";
user_data_dir: "/var/www/portals/gateway-user-data"
real_user_data_dir: "/data/gateway-user-data"
## Airavata Client related variables
-#airavata_server: "tls://gw77.iu.xsede.org"
airavata_server: "tls://{{ groups['api-orch'][0] }}"
airavata_port: "9930"
airavata_profile_service_server: "{{ groups['api-orch'][0] }}"
diff --git a/dev-tools/ansible/roles/api-orch/tasks/main.yml
b/dev-tools/ansible/roles/api-orch/tasks/main.yml
index 669c5ff..762cbe7 100644
--- a/dev-tools/ansible/roles/api-orch/tasks/main.yml
+++ b/dev-tools/ansible/roles/api-orch/tasks/main.yml
@@ -60,13 +60,6 @@
group={{ group }}
mode="u=rw,g=r,o=r"
-- name: Copy Gfac configuration file
- template: src=gfac-config.yaml.j2
- dest="{{ api_orch_dir }}/{{ airavata_dist }}/bin/gfac-config.yaml"
- owner={{ user }}
- group={{ group }}
- mode="u=rw,g=r,o=r"
-
- name: Copy logback configuration file
template: src=logback.xml.j2
dest="{{ api_orch_dir }}/{{ airavata_dist }}/bin/logback.xml"
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
deleted file mode 100644
index ba18caa..0000000
--- a/dev-tools/ansible/roles/api-orch/templates/gfac-config.yaml.j2
+++ /dev/null
@@ -1,117 +0,0 @@
-##################################################################
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-################################################################
-
-jobSubmitters:
- - submissionProtocol: SSH
- taskClass: org.apache.airavata.gfac.impl.task.DefaultJobSubmissionTask
-# properties:
-# - userName: airavata
-# passPhrase: airavata
-# privateKey: /path/to/the/privatekey
-# publicKey: /path/to/the/publickey
-# hostName: remote.client.hostName
-
- - submissionProtocol: SSH_FORK
- taskClass: org.apache.airavata.gfac.impl.task.ForkJobSubmissionTask
-
- - submissionProtocol: LOCAL
- taskClass: org.apache.airavata.gfac.impl.task.DefaultJobSubmissionTask
-
-# Following job subbmitters are not yet implemented.
-
- # - submissionProtocol: GSISSH
- # taskClass: org.apache.airavata.task.adapters.GSISSHJobSubmissionTask
-commonTasks:
- - type: SETUP
- taskClass: org.apache.airavata.task.common.SetupTask
-
- - type: CLEANUP
- taskClass: org.apache.airavata.task.common.CleanupTask
-
-fileTransferTasks:
-# - transferProtocol: SCP
-# taskClass: org.apache.airavata.gfac.impl.task.DataStageTask
-
-# If your client doen't run the same instance where airavata server is running
then you need to comment above
-# DataStageTask and uncomment SCPDataStageTask. To work with SCPDataStageTask,
you either need to
-# provide ssh keys or password.
-
- - transferProtocol: SCP
- taskClass: org.apache.airavata.gfac.impl.task.SCPDataStageTask
- properties:
- - userName: root
- passPhrase: ultrascan
- privateKeyPath: /home/airavata/.ssh/id_rsa
- publicKeyPath: /home/airavata/.ssh/id_rsa.pub
- hostName: gw75.iu.xsede.org
- inputPath: /var/www/portal/experimentData/
-# password: password
-
-# Following transfer tasks are not yet implemented.
- #- transferProtocol: SFTP
- # taskClass: org.apache.airavata.task.adapters.SFTPFileTransferTask
-
- #- transferProtocol: GRIDFTP
- # taskClass: org.apache.airavata.task.adapters.GRIDFTPFileTransferTask
-
- #- transferProtocol: LOCAL
- # taskClass: org.apache.airavata.task.adapters.LocalFileTransferTask
-
-resources:
- - jobManagerType: PBS
- commandOutputParser: org.apache.airavata.gfac.impl.job.PBSOutputParser
- emailParser: org.apache.airavata.gfac.monitor.email.parser.PBSEmailParser
- resourceEmailAddresses:
- - [email protected] # gordon
- - [email protected] # Bigred2
- - root <[email protected]> # Bigred2
- - root <[email protected]> # alamo
- - root <[email protected]> #karst
-
- - jobManagerType: SLURM
- commandOutputParser: org.apache.airavata.gfac.impl.job.SlurmOutputParser
- emailParser: org.apache.airavata.gfac.monitor.email.parser.SLURMEmailParser
- resourceEmailAddresses:
- - SDSC Admin <[email protected]> # comet
- - [email protected] # stampede
- - SDSC Admin <[email protected]> # comet new
- - Slurm <[email protected]> # bridges
- - Slurm Daemon <[email protected]> # OU Schooner
- - [email protected] # stampede2
- - Slurm service account <[email protected]> # 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 <root@local> # USD HPC Cluster
- - root <[email protected]> # 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
diff --git a/dev-tools/ansible/roles/helix_setup/defaults/main.yml
b/dev-tools/ansible/roles/helix_setup/defaults/main.yml
index 19222ce..d289857 100644
--- a/dev-tools/ansible/roles/helix_setup/defaults/main.yml
+++ b/dev-tools/ansible/roles/helix_setup/defaults/main.yml
@@ -24,10 +24,10 @@ helix_participant_name: "helixparticipant"
helix_pre_wm_name: "prewm"
helix_post_wm_name: "postwm"
-helix_controller_version: "helix-controller-{{ snapshot_version }}"
-helix_participant_version: "helix-participant-{{ snapshot_version }}"
-helix_pre_wm_version: "helix-pre-wm-{{ snapshot_version }}"
-helix_post_wm_version: "helix-post-wm-{{ snapshot_version }}"
+helix_controller_version: "apache-airavata-controller-{{ snapshot_version }}"
+helix_participant_version: "apache-airavata-participant-{{ snapshot_version }}"
+helix_pre_wm_version: "apache-airavata-pre-wm-{{ snapshot_version }}"
+helix_post_wm_version: "apache-airavata-post-wm-{{ snapshot_version }}"
helix_controller_dist_name: "{{ helix_controller_version }}-bin.tar.gz"
helix_participant_dist_name: "{{ helix_participant_version }}-bin.tar.gz"
diff --git a/dev-tools/ansible/roles/helix_setup/tasks/main.yml
b/dev-tools/ansible/roles/helix_setup/tasks/main.yml
index 90f0a29..5439110 100644
--- a/dev-tools/ansible/roles/helix_setup/tasks/main.yml
+++ b/dev-tools/ansible/roles/helix_setup/tasks/main.yml
@@ -71,7 +71,7 @@
# Copy required distributions to the deployment directory
- name: Copy distributions to airavata-helix deployment directory
- unarchive: "src={{ airavata_source_dir
}}/modules/airavata-helix/helix-distribution/target/{{ item }}
+ unarchive: "src={{ airavata_source_dir }}/modules/distribution/target/{{
item }}
dest={{ helix_dir }}/ copy=no"
with_items:
- "{{ helix_controller_dist_name }}"
diff --git a/dev-tools/ansible/roles/job_monitor/defaults/main.yml
b/dev-tools/ansible/roles/job_monitor/defaults/main.yml
index 6556353..81efba0 100644
--- a/dev-tools/ansible/roles/job_monitor/defaults/main.yml
+++ b/dev-tools/ansible/roles/job_monitor/defaults/main.yml
@@ -26,13 +26,13 @@ helix_pre_wm_name: "prewm"
helix_post_wm_name: "postwm"
# Variables related to email monitor
-email_monitor_version: "email-monitor-{{ snapshot_version }}"
+email_monitor_version: "apache-airavata-email-monitor-{{ snapshot_version }}"
email_monitor_dist_name: "{{ email_monitor_version }}-bin.tar.gz"
email_monitor_log_dir: "{{ helix_dir }}/{{ email_monitor_version }}/logs"
email_job_monitor_broker_publisher: "EmailBasedProducer"
# Variables related to realtime monitor
-realtime_monitor_version: "realtime-monitor-{{ snapshot_version }}"
+realtime_monitor_version: "apache-airavata-realtime-monitor-{{
snapshot_version }}"
realtime_monitor_dist_name: "{{ realtime_monitor_version }}-bin.tar.gz"
realtime_monitor_log_dir: "{{ helix_dir }}/{{ realtime_monitor_version }}/logs"
realtime_monitor_broker_publisher: "RealtimeProducer"
diff --git a/dev-tools/ansible/roles/job_monitor/tasks/main.yml
b/dev-tools/ansible/roles/job_monitor/tasks/main.yml
index f01b2b4..87a21c7 100644
--- a/dev-tools/ansible/roles/job_monitor/tasks/main.yml
+++ b/dev-tools/ansible/roles/job_monitor/tasks/main.yml
@@ -46,7 +46,7 @@
# Copy job monitoring distributions to the deployment directory
- name: Copy Job monitoring distributions to airavata-helix deployment
directory
- unarchive: "src={{ airavata_source_dir
}}/modules/job-monitor/job-monitor-distribution/target/{{ item }}
+ unarchive: "src={{ airavata_source_dir }}/modules/distribution/target/{{
item }}
dest={{ helix_dir }}/ copy=no"
with_items:
- "{{ email_monitor_dist_name }}"
