gCubeSystem
/
dataminer-pool-manager
15
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-analysis/dataminer-pool-manager@134331 82a268e6-3cf1-43bd-a215-b396298e98cf

This commit is contained in:
Paolo Fabriani 2016-11-17 16:16:35 +00:00
parent 9da808432d
commit 07f623e95b
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/gcube/dataanalysys/dataminerpoolmanager/ansiblebridge/AnsibleSerializeHelper.java
View File

@ -36,6 +36,8 @@ public class AnsibleSerializeHelper ***REMOVED***
for(String r:playbook.getRoles()) ***REMOVED*** for(String r:playbook.getRoles()) ***REMOVED***
out+=" - " + r+"\n"; out+=" - " + r+"\n";
***REMOVED*** ***REMOVED***
out+=" vars:\n";
out+=" os_package_state: present\n";
out = out.trim(); out = out.trim();
serialize(out, playbookFile); serialize(out, playbookFile);
***REMOVED*** ***REMOVED***

4
src/main/java/org/gcube/dataanalysys/dataminerpoolmanager/ansiblebridge/template/AlgorithmPackage.java
View File

@ -38,10 +38,10 @@ public class AlgorithmPackage ***REMOVED***
public Collection<Role> getRoles(TemplateManager tm) ***REMOVED*** public Collection<Role> getRoles(TemplateManager tm) ***REMOVED***
Collection<Role> out = new Vector<>(); Collection<Role> out = new Vector<>();
for(String mode:new String[]***REMOVED***"add", "remove", "update"***REMOVED***) ***REMOVED*** for(String mode:new String[]***REMOVED***"add", "remove", "update"***REMOVED***) ***REMOVED***
String roleName = "algorithm-"+this.getAlgorithm().getName()+("add".equals(mode) ? "" : "-"+mode); String roleName = "gcube-algorithm-"+this.getAlgorithm().getName()+("add".equals(mode) ? "" : "-"+mode);
try ***REMOVED*** try ***REMOVED***
***REMOVED*** find template ***REMOVED*** find template
Role template = tm.getRoleTemplate("algorithm-" + mode); Role template = tm.getRoleTemplate("gcube-algorithm-" + mode);
***REMOVED*** ***REMOVED***
if(template!=null) ***REMOVED*** if(template!=null) ***REMOVED***
Map<String, String> dictionary = this.getDictionary(this.getAlgorithm()); Map<String, String> dictionary = this.getDictionary(this.getAlgorithm());

4
src/main/java/org/gcube/dataanalysys/dataminerpoolmanager/clients/ISClient.java
View File

@ -22,7 +22,7 @@ public class ISClient ***REMOVED***
* @param vreName * @param vreName
* @return * @return
*/ */
public Collection<Host> listDataminersInVRE(String scope) ***REMOVED*** public Collection<Host> listDataminersInVRE() ***REMOVED***
boolean remote = false; boolean remote = false;
@ -34,8 +34,6 @@ public class ISClient ***REMOVED***
return out; return out;
***REMOVED*** else ***REMOVED*** ***REMOVED*** else ***REMOVED***
ScopeProvider.instance.set(scope);
SimpleQuery query = queryFor(ServiceEndpoint.class); SimpleQuery query = queryFor(ServiceEndpoint.class);
query.addCondition("$resource/Profile/Category/text() eq 'DataAnalysis'") query.addCondition("$resource/Profile/Category/text() eq 'DataAnalysis'")

2
src/main/java/org/gcube/dataanalysys/dataminerpoolmanager/service/DataminerPoolManager.java
View File

@ -110,7 +110,7 @@ public class DataminerPoolManager ***REMOVED***
***REMOVED*** create the cluster (dataminers in the vre) ***REMOVED*** create the cluster (dataminers in the vre)
Cluster cluster = new Cluster(); Cluster cluster = new Cluster();
for(Host h:new ISClient().listDataminersInVRE(vre)) ***REMOVED*** for(Host h:new ISClient().listDataminersInVRE()) ***REMOVED***
cluster.addHost(h); cluster.addHost(h);
***REMOVED*** ***REMOVED***