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

Fix Node Sources deployment according to server updates

src/main/resources/Define_NS_AWS.xml

@@ -10,6 +10,7 @@
     <variable name="security_group" value="" model=""/>
     <variable name="image" value="" model=""/>
     <variable name="rm_host_name" value="" model=""/>
+    <variable name="pa_port" value="" model=""/>
   </variables>
   <description>
     <![CDATA[ A workflow that executes Groovy in JVM. ]]>
@@ -28,9 +29,10 @@
         <script>
           <code language="groovy">
             <![CDATA[
-// Conncting to the Scheduler
+// Connecting to the Scheduler
 def retCode = 0;
 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
 print "(1/4) Connecting to the RM ..."
 rmapi.connect()
@@ -50,8 +52,9 @@ def infrastructureParameters = [variables.get("aws_username"), //username
                                 variables.get("security_group"), //sg
                                 "", //subnet
                                 variables.get("rm_host_name"), //host
-                                "http://" + variables.get("rm_host_name") + ":8080/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") + "/connector-iaas", //connector-iaas url
+                                protocol + "://" + variables.get("rm_host_name") + ":"+ variables.get("pa_port") + "/rest/node.jar", //node jar url
+                                "-Dproactive.useIPaddress=true", //additionalProperties"
                                 "",
                                 "300000", //timeout
                                 ""]

src/main/resources/Define_NS_OS.xml

@@ -35,7 +35,7 @@
         <script>
           <code language="groovy">
             <![CDATA[
-// Conncting to the Scheduler
+// Connecting to the Scheduler
 def retCode = 0;
 def nodeSourceName = variables.get("NS_name")
 def protocol = (variables.get("pa_port") == "443" || variables.get("pa_port") == "8443" ) ? "https" : "http"