Unverified Commit d4002364 authored by Mohamed Khalil LABIDI's avatar Mohamed Khalil LABIDI Committed by GitHub
Browse files

Merge pull request #14 from mklkun/fix-NS-deployment

Fix Node Sources deployment according to server updates
parents 4e043d9c 9d9a8ccb
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
<variable name="security_group" value="" model=""/> <variable name="security_group" value="" model=""/>
<variable name="image" value="" model=""/> <variable name="image" value="" model=""/>
<variable name="rm_host_name" value="" model=""/> <variable name="rm_host_name" value="" model=""/>
<variable name="pa_port" value="" model=""/>
</variables> </variables>
<description> <description>
<![CDATA[ A workflow that executes Groovy in JVM. ]]> <![CDATA[ A workflow that executes Groovy in JVM. ]]>
...@@ -28,9 +29,10 @@ ...@@ -28,9 +29,10 @@
<script> <script>
<code language="groovy"> <code language="groovy">
<![CDATA[ <![CDATA[
// Conncting to the Scheduler // Connecting to the Scheduler
def retCode = 0; def retCode = 0;
def nodeSourceName = variables.get("NS_name") def nodeSourceName = variables.get("NS_name")
def protocol = (variables.get("pa_port") == "443" || variables.get("pa_port") == "8443" ) ? "https" : "http"
println "[+] Preparation of NodeSoure " + nodeSourceName println "[+] Preparation of NodeSoure " + nodeSourceName
print "(1/4) Connecting to the RM ..." print "(1/4) Connecting to the RM ..."
rmapi.connect() rmapi.connect()
...@@ -50,8 +52,9 @@ def infrastructureParameters = [variables.get("aws_username"), //username ...@@ -50,8 +52,9 @@ def infrastructureParameters = [variables.get("aws_username"), //username
variables.get("security_group"), //sg variables.get("security_group"), //sg
"", //subnet "", //subnet
variables.get("rm_host_name"), //host variables.get("rm_host_name"), //host
"http://" + variables.get("rm_host_name") + ":8080/connector-iaas", //connector-iaas url protocol + "://" + variables.get("rm_host_name") + ":"+ variables.get("pa_port") + "/connector-iaas", //connector-iaas url
"http://" + variables.get("rm_host_name") + ":8080/rest/node.jar", //node jar url protocol + "://" + variables.get("rm_host_name") + ":"+ variables.get("pa_port") + "/rest/node.jar", //node jar url
"-Dproactive.useIPaddress=true", //additionalProperties"
"", "",
"300000", //timeout "300000", //timeout
""] ""]
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
<script> <script>
<code language="groovy"> <code language="groovy">
<![CDATA[ <![CDATA[
// Conncting to the Scheduler // Connecting to the Scheduler
def retCode = 0; def retCode = 0;
def nodeSourceName = variables.get("NS_name") def nodeSourceName = variables.get("NS_name")
def protocol = (variables.get("pa_port") == "443" || variables.get("pa_port") == "8443" ) ? "https" : "http" def protocol = (variables.get("pa_port") == "443" || variables.get("pa_port") == "8443" ) ? "https" : "http"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment