From 0d607c86fb004a3b3f6e75defaea0eab942a71f2 Mon Sep 17 00:00:00 2001
From: Isuru Ranawaka <irjanith@gmail.com>
Date: Tue, 7 Sep 2021 21:13:45 -0400
Subject: [PATCH] data-orch

---
 ansible/datalake.yml                                 |  6 +++---
 .../src/main/resources/application.properties        |  8 ++++----
 .../src/main/resources/config.yml                    | 12 +++++++++---
 pom.xml                                              |  2 +-
 4 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/ansible/datalake.yml b/ansible/datalake.yml
index 273a548..c55ad53 100644
--- a/ansible/datalake.yml
+++ b/ansible/datalake.yml
@@ -21,10 +21,10 @@
 ---
 - hosts: data-lake
   roles:
-    - env_setup
-    - kafka
+ #   - env_setup
+ #   - kafka
 #    - custos
 #    - consul
 #    - mft
-#    - data_lake
+    - data_lake
 #    - workflow-engine
diff --git a/data-orchestrator/data-orchestrator-service/data-orchestrator-api-server/src/main/resources/application.properties b/data-orchestrator/data-orchestrator-service/data-orchestrator-api-server/src/main/resources/application.properties
index 88dd260..1c2d3db 100644
--- a/data-orchestrator/data-orchestrator-service/data-orchestrator-api-server/src/main/resources/application.properties
+++ b/data-orchestrator/data-orchestrator-service/data-orchestrator-api-server/src/main/resources/application.properties
@@ -1,6 +1,6 @@
-spring.datasource.url=jdbc:mysql://localhost:3306/data_orchestrator?useSSL=false&serverTimezone=UTC&useLegacyDatetimeCode=false&createDatabaseIfNotExist=true&allowPublicKeyRetrieval=true
+spring.datasource.url=jdbc:mysql://149.165.157.235:3306/data_orchestrator?useSSL=false&serverTimezone=UTC&useLegacyDatetimeCode=false&createDatabaseIfNotExist=true&allowPublicKeyRetrieval=true
 spring.datasource.username=root
-#spring.datasource.password=""
+spring.datasource.password=Hrtcnser_t3452
 
 
 ## Hibernate Properties
@@ -14,7 +14,7 @@ spring.jpa.hibernate.naming.physical-strategy=org.hibernate.boot.model.naming.Ph
 
 config.path=/Users/isururanawaka/Documents/Airavata_Repository/airavata-data-lake/data-orchestrator/data-orchestrator-service/data-orchestrator-api-server/src/main/resources/config.yml
 server.port=8899
-mft.host=localhost
+mft.host=149.165.157.235
 mft.port=6565
-drms.host=localhost
+drms.host=149.165.157.235
 drms.port=7070
\ No newline at end of file
diff --git a/data-orchestrator/data-orchestrator-service/data-orchestrator-api-server/src/main/resources/config.yml b/data-orchestrator/data-orchestrator-service/data-orchestrator-api-server/src/main/resources/config.yml
index 43fb605..2ec5c10 100644
--- a/data-orchestrator/data-orchestrator-service/data-orchestrator-api-server/src/main/resources/config.yml
+++ b/data-orchestrator/data-orchestrator-service/data-orchestrator-api-server/src/main/resources/config.yml
@@ -6,12 +6,18 @@ messageFilter:
   resourceNameExclusions: "swp$"
 outboundEventProcessor:
   pollingInterval: 5
-  workflowEngineHost: "localhost"
+  workflowEngineHost: "149.165.157.235"
   workflowPort: 6565
-  drmsHost: "localhost"
+  drmsHost: "149.165.157.235"
   drmsPort: 7070
+  mftHost: "149.165.157.235"
+  mftPort: 7004
 consumer:
   brokerURL: "149.165.157.235:9092"
   consumerGroup: "DataOrchestratorGroup2"
   topic: "data-orchestrator-file-events"
-  maxPollRecordsConfig: 10
\ No newline at end of file
+  maxPollRecordsConfig: 10
+tenantConfigs:
+  tenantId: "custos-ii8g0cfwsz6ruwezykn9-10002640"
+  userGroup: "emc-users_e8a37f6d-e3b3-4e4a-9081-265bb42b1b99"
+  adminGroup: "admin-group_c1aac070-1512-4e98-b1d1-e06a94f03665"
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 5dcb453..24676ba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -100,7 +100,7 @@
         <jsch>0.1.55</jsch>
         <sshj>0.27.0</sshj>
         <mariadb.jdbc>2.5.1</mariadb.jdbc>
-        <custos.clients.version>1.0-SNAPSHOT</custos.clients.version>
+        <custos.clients.version>1.1-SNAPSHOT</custos.clients.version>
         <io.grpc.version>1.25.0</io.grpc.version>
         <google.common.protos>1.17.0</google.common.protos>
         <io.micrometer.version>1.3.1</io.micrometer.version>