From 07f623e95bbbb9fb7896532bc6329434c5d83986 Mon Sep 17 00:00:00 2001
From: Paolo Fabriani <paolo.fabriani@eng.it>
Date: Thu, 17 Nov 2016 16:16:35 +0000
Subject: [PATCH] git-svn-id:
 https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-analysis/dataminer-pool-manager@134331
 82a268e6-3cf1-43bd-a215-b396298e98cf

---
 .../ansiblebridge/AnsibleSerializeHelper.java                 | 2 ++
 .../ansiblebridge/template/AlgorithmPackage.java              | 4 ++--
 .../dataanalysys/dataminerpoolmanager/clients/ISClient.java   | 4 +---
 .../dataminerpoolmanager/service/DataminerPoolManager.java    | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/gcube/dataanalysys/dataminerpoolmanager/ansiblebridge/AnsibleSerializeHelper.java b/src/main/java/org/gcube/dataanalysys/dataminerpoolmanager/ansiblebridge/AnsibleSerializeHelper.java
index b0eee20..bdc7639 100644
--- a/src/main/java/org/gcube/dataanalysys/dataminerpoolmanager/ansiblebridge/AnsibleSerializeHelper.java
+++ b/src/main/java/org/gcube/dataanalysys/dataminerpoolmanager/ansiblebridge/AnsibleSerializeHelper.java
@@ -36,6 +36,8 @@ public class AnsibleSerializeHelper ***REMOVED***
     for(String r:playbook.getRoles()) ***REMOVED***
       out+="    - " + r+"\n";
     ***REMOVED***
+    out+="  vars:\n";
+    out+="    os_package_state: present\n";
     out = out.trim();
     serialize(out, playbookFile);
   ***REMOVED***
diff --git a/src/main/java/org/gcube/dataanalysys/dataminerpoolmanager/ansiblebridge/template/AlgorithmPackage.java b/src/main/java/org/gcube/dataanalysys/dataminerpoolmanager/ansiblebridge/template/AlgorithmPackage.java
index cb3bf49..17e68a1 100644
--- a/src/main/java/org/gcube/dataanalysys/dataminerpoolmanager/ansiblebridge/template/AlgorithmPackage.java
+++ b/src/main/java/org/gcube/dataanalysys/dataminerpoolmanager/ansiblebridge/template/AlgorithmPackage.java
@@ -38,10 +38,10 @@ public class AlgorithmPackage ***REMOVED***
   public Collection<Role> getRoles(TemplateManager tm) ***REMOVED***
     Collection<Role> out = new Vector<>();
     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***
         ***REMOVED*** find template
-        Role template = tm.getRoleTemplate("algorithm-" + mode);
+        Role template = tm.getRoleTemplate("gcube-algorithm-" + mode);
         ***REMOVED*** 
         if(template!=null) ***REMOVED***
           Map<String, String> dictionary = this.getDictionary(this.getAlgorithm());
diff --git a/src/main/java/org/gcube/dataanalysys/dataminerpoolmanager/clients/ISClient.java b/src/main/java/org/gcube/dataanalysys/dataminerpoolmanager/clients/ISClient.java
index a980146..b99b6c5 100644
--- a/src/main/java/org/gcube/dataanalysys/dataminerpoolmanager/clients/ISClient.java
+++ b/src/main/java/org/gcube/dataanalysys/dataminerpoolmanager/clients/ISClient.java
@@ -22,7 +22,7 @@ public class ISClient ***REMOVED***
    * @param vreName
    * @return
    */
-  public Collection<Host> listDataminersInVRE(String scope) ***REMOVED***
+  public Collection<Host> listDataminersInVRE() ***REMOVED***
 
     boolean remote = false;
 
@@ -34,8 +34,6 @@ public class ISClient ***REMOVED***
       return out;
     ***REMOVED*** else ***REMOVED***
 
-      ScopeProvider.instance.set(scope);
-
       SimpleQuery query = queryFor(ServiceEndpoint.class);
 
       query.addCondition("$resource/Profile/Category/text() eq 'DataAnalysis'")
diff --git a/src/main/java/org/gcube/dataanalysys/dataminerpoolmanager/service/DataminerPoolManager.java b/src/main/java/org/gcube/dataanalysys/dataminerpoolmanager/service/DataminerPoolManager.java
index 0ec942e..694691e 100644
--- a/src/main/java/org/gcube/dataanalysys/dataminerpoolmanager/service/DataminerPoolManager.java
+++ b/src/main/java/org/gcube/dataanalysys/dataminerpoolmanager/service/DataminerPoolManager.java
@@ -110,7 +110,7 @@ public class DataminerPoolManager ***REMOVED***
     
     ***REMOVED*** create the cluster (dataminers in the vre)
     Cluster cluster = new Cluster();
-    for(Host h:new ISClient().listDataminersInVRE(vre)) ***REMOVED***
+    for(Host h:new ISClient().listDataminersInVRE()) ***REMOVED***
       cluster.addHost(h);
     ***REMOVED***