git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-analysis/dataminer-pool-manager@148485 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
parent
23d6c0e725
commit
9ef6c5477f
|
@ -94,9 +94,9 @@ public class HAProxy ***REMOVED***
|
||||||
***REMOVED******REMOVED***
|
***REMOVED******REMOVED***
|
||||||
else ***REMOVED***
|
else ***REMOVED***
|
||||||
***REMOVED*** prod
|
***REMOVED*** prod
|
||||||
URL stockURL = new
|
***REMOVED***URL stockURL = new
|
||||||
URL("http:***REMOVED***data.d4science.org/Yk4zSFF6V3JOSytNd3JkRDlnRFpDUUR5TnRJZEw2QjRHbWJQNStIS0N6Yz0");
|
***REMOVED***URL("http:***REMOVED***data.d4science.org/Yk4zSFF6V3JOSytNd3JkRDlnRFpDUUR5TnRJZEw2QjRHbWJQNStIS0N6Yz0");
|
||||||
***REMOVED***URL stockURL = new URL("http:***REMOVED***"+ ISClient.getHProxy() +":8880/;csv");
|
URL stockURL = new URL("http:***REMOVED***"+ ISClient.getHProxy() +":8880/;csv");
|
||||||
***REMOVED***URL stockURL = new URL("http:***REMOVED***data.d4science.org/c29KTUluTkZnRlB0WXE5NVNaZnRoR0dtYThUSmNTVlhHbWJQNStIS0N6Yz0");
|
***REMOVED***URL stockURL = new URL("http:***REMOVED***data.d4science.org/c29KTUluTkZnRlB0WXE5NVNaZnRoR0dtYThUSmNTVlhHbWJQNStIS0N6Yz0");
|
||||||
***REMOVED***System.out.println(stockURL);
|
***REMOVED***System.out.println(stockURL);
|
||||||
***REMOVED*** dev
|
***REMOVED*** dev
|
||||||
|
|
|
@ -9,6 +9,7 @@ import org.gcube.dataanalysis.dataminer.poolmanager.ansiblebridge.AnsibleBridge;
|
||||||
import org.gcube.dataanalysis.dataminer.poolmanager.clients.HAProxy;
|
import org.gcube.dataanalysis.dataminer.poolmanager.clients.HAProxy;
|
||||||
import org.gcube.dataanalysis.dataminer.poolmanager.clients.ISClient;
|
import org.gcube.dataanalysis.dataminer.poolmanager.clients.ISClient;
|
||||||
import org.gcube.dataanalysis.dataminer.poolmanager.datamodel.*;
|
import org.gcube.dataanalysis.dataminer.poolmanager.datamodel.*;
|
||||||
|
import org.gcube.dataanalysis.dataminer.poolmanager.util.Props;
|
||||||
import org.gcube.dataanalysis.dataminer.poolmanager.util.SVNUpdater;
|
import org.gcube.dataanalysis.dataminer.poolmanager.util.SVNUpdater;
|
||||||
import org.gcube.informationsystem.publisher.AdvancedScopedPublisher;
|
import org.gcube.informationsystem.publisher.AdvancedScopedPublisher;
|
||||||
import org.gcube.informationsystem.publisher.RegistryPublisherFactory;
|
import org.gcube.informationsystem.publisher.RegistryPublisherFactory;
|
||||||
|
@ -72,8 +73,9 @@ public class DataminerPoolManager ***REMOVED***
|
||||||
private Cluster getStagingDataminerCluster()***REMOVED***
|
private Cluster getStagingDataminerCluster()***REMOVED***
|
||||||
Cluster cluster = new Cluster();
|
Cluster cluster = new Cluster();
|
||||||
Host h = new Host();
|
Host h = new Host();
|
||||||
|
Props p = new Props();
|
||||||
***REMOVED***TODO: read this from configuration or IS?
|
***REMOVED***TODO: read this from configuration or IS?
|
||||||
h.setName("dataminer1-devnext.d4science.org");
|
h.setName(p.getStagingHost());
|
||||||
cluster.addHost(h);
|
cluster.addHost(h);
|
||||||
return cluster;
|
return cluster;
|
||||||
***REMOVED***
|
***REMOVED***
|
||||||
|
|
|
@ -0,0 +1,52 @@
|
||||||
|
package org.gcube.dataanalysis.dataminer.poolmanager.util;
|
||||||
|
|
||||||
|
***REMOVED***
|
||||||
|
import java.util.Properties;
|
||||||
|
|
||||||
|
public class Props ***REMOVED***
|
||||||
|
public static String home = System.getProperty("user.home");
|
||||||
|
|
||||||
|
public Props() ***REMOVED***
|
||||||
|
***REMOVED***
|
||||||
|
|
||||||
|
public String getCSVUrl() ***REMOVED***
|
||||||
|
Properties props = new Properties();
|
||||||
|
java.io.InputStream input = Props.class.getClassLoader().getResourceAsStream("service.properties");
|
||||||
|
|
||||||
|
***REMOVED*** loading properites from properties file
|
||||||
|
try ***REMOVED***
|
||||||
|
props.load(input);
|
||||||
|
***REMOVED*** catch (IOException e) ***REMOVED***
|
||||||
|
***REMOVED*** TODO Auto-generated catch block
|
||||||
|
e.printStackTrace();
|
||||||
|
***REMOVED***
|
||||||
|
|
||||||
|
***REMOVED*** reading proeprty
|
||||||
|
String path = props.getProperty("HAPROXY_CSV");
|
||||||
|
return path;
|
||||||
|
|
||||||
|
***REMOVED***
|
||||||
|
|
||||||
|
public String getStagingHost() ***REMOVED***
|
||||||
|
Properties props = new Properties();
|
||||||
|
java.io.InputStream input = Props.class.getClassLoader().getResourceAsStream("service.properties");
|
||||||
|
|
||||||
|
***REMOVED*** loading properites from properties file
|
||||||
|
try ***REMOVED***
|
||||||
|
props.load(input);
|
||||||
|
***REMOVED*** catch (IOException e) ***REMOVED***
|
||||||
|
***REMOVED*** TODO Auto-generated catch block
|
||||||
|
e.printStackTrace();
|
||||||
|
***REMOVED***
|
||||||
|
|
||||||
|
***REMOVED*** reading proeprty
|
||||||
|
String path = props.getProperty("STAGING_HOST");
|
||||||
|
return path;
|
||||||
|
|
||||||
|
***REMOVED***
|
||||||
|
|
||||||
|
public static void main(String[] args) ***REMOVED***
|
||||||
|
Props a = new Props();
|
||||||
|
System.out.println(a.getStagingHost());
|
||||||
|
***REMOVED***
|
||||||
|
***REMOVED***
|
|
@ -0,0 +1,3 @@
|
||||||
|
#YML node file
|
||||||
|
STAGING_HOST: dataminer1-devnext.d4science.org
|
||||||
|
#HAPROXY_CSV: http:***REMOVED***data.d4science.org/Yk4zSFF6V3JOSytNd3JkRDlnRFpDUUR5TnRJZEw2QjRHbWJQNStIS0N6Yz0
|
Loading…
Reference in New Issue