Repository: airavata Updated Branches: refs/heads/master d88488a9a -> b7cee3e0b
added gfac config yaml file to distribution and removed gfac config xml file Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/b7cee3e0 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/b7cee3e0 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/b7cee3e0 Branch: refs/heads/master Commit: b7cee3e0b82f3539c9f70051b8162bbb5713e142 Parents: d88488a Author: Shameera Rathanyaka <[email protected]> Authored: Wed Jul 8 12:24:22 2015 -0400 Committer: Shameera Rathanyaka <[email protected]> Committed: Wed Jul 8 12:24:22 2015 -0400 ---------------------------------------------------------------------- distribution/src/main/assembly/bin-assembly.xml | 2 +- .../server/src/main/resources/gfac-config.xml | 128 ------------------- .../server/src/main/resources/gfac-config.yaml | 79 ++++++++++++ 3 files changed, 80 insertions(+), 129 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/b7cee3e0/distribution/src/main/assembly/bin-assembly.xml ---------------------------------------------------------------------- diff --git a/distribution/src/main/assembly/bin-assembly.xml b/distribution/src/main/assembly/bin-assembly.xml index 5276268..c00c2e2 100644 --- a/distribution/src/main/assembly/bin-assembly.xml +++ b/distribution/src/main/assembly/bin-assembly.xml @@ -97,7 +97,7 @@ <include>host.xml</include> <include>persistence.xml</include> <include>provenance.sql</include> - <include>gfac-config.xml</include> + <include>gfac-config.yaml</include> <include>PBSTemplate.xslt</include> <include>SLURMTemplate.xslt</include> <include>LSFTemplate.xslt</include> http://git-wip-us.apache.org/repos/asf/airavata/blob/b7cee3e0/modules/configuration/server/src/main/resources/gfac-config.xml ---------------------------------------------------------------------- diff --git a/modules/configuration/server/src/main/resources/gfac-config.xml b/modules/configuration/server/src/main/resources/gfac-config.xml deleted file mode 100644 index ced84c8..0000000 --- a/modules/configuration/server/src/main/resources/gfac-config.xml +++ /dev/null @@ -1,128 +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. --> - -<GFac> - <DaemonHandlers> - <Handler class="org.apache.airavata.gfac.monitor.handlers.GridPullMonitorHandler"/> - </DaemonHandlers> - <GlobalHandlers> - <InHandlers> - <Handler class="org.apache.airavata.gfac.core.handler.AppDescriptorCheckHandler"> - <property name="name" value="value"/> - </Handler> - </InHandlers> - <OutHandlers></OutHandlers> - </GlobalHandlers> - <Provider class="org.apache.airavata.gfac.local.provider.impl.LocalProvider" submission="LOCAL"> - <InHandlers> - <Handler class="org.apache.airavata.gfac.local.handler.LocalDirectorySetupHandler"/> - <Handler class="org.apache.airavata.gfac.local.handler.LocalInputHandler"/> - </InHandlers> - </Provider> - <Provider class="org.apache.airavata.gfac.gram.provider.impl.GramProvider" submission="GLOBUS" security="GSI"> - <property name="name" value="value"/> - <InHandlers> - <Handler class="org.apache.airavata.gfac..gram.handler.GramDirectorySetupHandler"> - <property name="name" value="value"/> - </Handler> - <Handler class="org.apache.airavata.gfac..gram.handler.GridFTPInputHandler"/> - </InHandlers> - <OutHandlers> - <Handler class="org.apache.airavata.gfac..gram.handler.GridFTPOutputHandler"/> - </OutHandlers> - </Provider> - <Provider class="org.apache.airavata.gfac.bes.provider.impl.BESProvider" submission="UNICORE" security="GSI"> - </Provider> - - <Provider class="org.apache.airavata.gfac.ec2.EC2Provider" submission="CLOUD" security=""> - <InHandlers/> - <OutHandlers/> - </Provider> - - <Provider class="org.apache.airavata.gfac.hadoop.provider.impl.HadoopProvider" submission="CLOUD" > - <InHandlers> - <Handler class="org.apache.airavata.gfac.hadoop.handler.HadoopDeploymentHandler"/> - <Handler class="org.apache.airavata.gfac.hadoop.handler.HDFSDataMovementHandler"/> - </InHandlers> - <OutHandlers/> - </Provider> - - <Application name="UltraScan"> - <InHandlers> - <Handler class="org.apache.airavata.gfac.handler.GfacDirectorySetupHandler"/> - <Handler class="org.apache.airavata.gfac.gram.handler.GridFTPInputHandler"/> - </InHandlers> - <OutHandlers> - <Handler class="org.apache.airavata.gfac.gram.handler.GridFTPOutputHandler"/> - </OutHandlers> - </Application> - <Application name="Gaussian"> - <InHandlers> - <Handler class="org.apache.airavata.application.gaussian.handler.GaussianHandler"/> - </InHandlers> - </Application> - - <Provider class="org.apache.airavata.gfac.ssh.provider.impl.SSHProvider" submission="SSH" executionMode="async"> - <InHandlers> - <Handler class="org.apache.airavata.gfac.ssh.handler.SSHDirectorySetupHandler"/> - <!--Handler class="org.apache.airavata.gfac.ssh.handler.AdvancedSCPInputHandler"> - <property name="privateKeyPath" value="/Users/lahirugunathilake/.ssh/id_dsa"/> - <property name="publicKeyPath" value="/Users/lahirugunathilake/.ssh/id_dsa.pub"/> - <property name="userName" value="root"/> - <property name="hostName" value="gw98.iu.xsede.org"/> - <property name="inputPath" value="/tmp"/> - <property name="passPhrase" value="/home/airavata/outputData"/> - <property name="password" value="/home/airavata/outputData"/> <either we have to set password or keys, password has higher preference> - </Handler--> - <Handler class="org.apache.airavata.gfac.ssh.handler.SSHInputHandler"/> - </InHandlers> - <OutHandlers> - <Handler class="org.apache.airavata.gfac.ssh.handler.NewSSHOutputHandler"/> - <!--Handler class="org.apache.airavata.gfac.ssh.handler.AdvancedSCPOutputHandler"> - <property name="privateKeyPath" value="/Users/lahirugunathilake/.ssh/id_dsa"/> - <property name="publicKeyPath" value="/Users/lahirugunathilake/.ssh/id_dsa.pub"/> - <property name="userName" value="root"/> - <property name="hostName" value="gw111.iu.xsede.org"/> - <property name="outputPath" value="/tmp"/> - <property name="passPhrase" value="/home/airavata/outputData"/> - <property name="password" value="/home/airavata/outputData"/> <either we have to set password or keys, password has higher preference> - </Handler--> - </OutHandlers> - </Provider> - <Provider class="org.apache.airavata.gfac.gsissh.provider.impl.GSISSHProvider" submission="SSH" security="GSI" executionMode="async"> - <InHandlers> - <Handler class="org.apache.airavata.gfac.gsissh.handler.GSISSHDirectorySetupHandler"/> - <!--Handler class="org.apache.airavata.gfac.ssh.handler.AdvancedSCPInputHandler"> - <property name="privateKeyPath" value="/Users/lahirugunathilake/.ssh/id_dsa"/> - <property name="publicKeyPath" value="/Users/lahirugunathilake/.ssh/id_dsa.pub"/> - <property name="userName" value="root"/> - <property name="hostName" value="gw98.iu.xsede.org"/> - <property name="inputPath" value="/tmp"/> - <property name="passPhrase" value="/home/airavata/outputData"/> - <property name="password" value="/home/airavata/outputData"/> <either we have to set password or keys, password has higher preference> - </Handler--> - <Handler class="org.apache.airavata.gfac.gsissh.handler.GSISSHInputHandler"/> - </InHandlers> - <OutHandlers> - <Handler class="org.apache.airavata.gfac.gsissh.handler.NewGSISSHOutputHandler"/> - <!--Handler class="org.apache.airavata.gfac.ssh.handler.AdvancedSCPOutputHandler"> - <property name="privateKeyPath" value="/Users/lahirugunathilake/.ssh/id_dsa"/> - <property name="publicKeyPath" value="/Users/lahirugunathilake/.ssh/id_dsa.pub"/> - <property name="userName" value="root"/> - <property name="hostName" value="gw111.iu.xsede.org"/> - <property name="outputPath" value="/tmp"/> - <property name="passPhrase" value="/home/airavata/outputData"/> - <property name="password" value="/home/airavata/outputData"/> <either we have to set password or keys, password has higher preference> - </Handler--> - </OutHandlers> - </Provider> -</GFac> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/airavata/blob/b7cee3e0/modules/configuration/server/src/main/resources/gfac-config.yaml ---------------------------------------------------------------------- diff --git a/modules/configuration/server/src/main/resources/gfac-config.yaml b/modules/configuration/server/src/main/resources/gfac-config.yaml new file mode 100644 index 0000000..5530547 --- /dev/null +++ b/modules/configuration/server/src/main/resources/gfac-config.yaml @@ -0,0 +1,79 @@ +################################################################## +# 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. +# +################################################################ + +config: + jobSubmitters: + - submissionProtocol: SSH + taskClass: org.apache.airavata.task.adapters.SSHJobSubmissionTask + properties: + - password: pwd123 + - passPhrase: test + - privateKey: key + - publicKey: pubkey + + - 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.task.adapters.SCPFileTransferTask + properties: + - password: pwd123 + - passPhrase: test + - privateKey: key + - publicKey: pubkey + + - transferProtocol: HTTP + taskClass: org.apache.airavata.task.adapters.HTTPFileTransferTask + + - transferProtocol: GRIDFTP + taskClass: org.apache.airavata.task.adapters.GRIDFTPFileTransferTask + + resources: + - jobManagerType: PBS + commandOutputParser: org.apache.airavata.commmand.PBSOutputParser + emailParser: org.apache.airavata.email.parser.PBSEmailParser + resourceEmailAddresses: + - [email protected] # gordon + - [email protected] # Bigred2 + - root <[email protected]> # Bigred2 + - root <[email protected]> # alamo + + - jobManagerType: SLURM + commandOutputParser: org.apache.airavata.commmand.SLURMOutputParser + emailParser: org.apache.airavata.email.parser.SLURMEmailParser + resourceEmailAddresses: + - SDSC Admin <[email protected]> # comet + - [email protected] # stampede + + - jobManagerType: UGE + commandOutputParser: org.apache.airavata.commmand.UGEOutputParser + emailParser: org.apache.airavata.email.parser.UGEEmailParser + resourceEmailAddresses: + - ls4.tacc.utexas.edu # contain Lonestar + +
