[airavata-data-lake] branch master updated: Updating tenant config ansibles

[di...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

dimuthuupe pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata-data-lake.git


The following commit(s) were added to refs/heads/master by this push:
     new 713cb88  Updating tenant config ansibles
713cb88 is described below

commit 713cb883c22c849f7281ab0261f2c2937e9bf46f
Author: Dimuthu Wannipurage <di...@gmail.com>
AuthorDate: Wed Sep 1 14:38:44 2021 -0400

    Updating tenant config ansibles
---
 ansible/inventories/test/group_vars/all/vars.yml         |  2 ++
 .../data_lake/templates/data-orchestrator/config.yml.j2  |  6 +++++-
 .../src/main/dist/conf/config.yml                        | 16 +++++++++++-----
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/ansible/inventories/test/group_vars/all/vars.yml b/ansible/inventories/test/group_vars/all/vars.yml
index 09e8740..9372ed1 100644
--- a/ansible/inventories/test/group_vars/all/vars.yml
+++ b/ansible/inventories/test/group_vars/all/vars.yml
@@ -98,6 +98,8 @@ datalake_data_orch_grpc_port: 6566
 datalake_data_orch_broker_url: "{{ kafka_url }}"
 datalake_data_orch_broker_consumer_group: DataOrchestratorGroup2
 datalake_data_orch_broker_topic: data-orchestrator-file-events
+datalake_data_orch_user_group: emc-users_e8a37f6d-e3b3-4e4a-9081-265bb42b1b99
+datalake_data_orch_admin_group: admin-group_c1aac070-1512-4e98-b1d1-e06a94f03665
 
 workflow_deployment_dir: "{{ user_home }}/workflow-deployment"
 workflow_zookeeper_url: localhost:2181
diff --git a/ansible/roles/data_lake/templates/data-orchestrator/config.yml.j2 b/ansible/roles/data_lake/templates/data-orchestrator/config.yml.j2
index 914245a..f64e465 100644
--- a/ansible/roles/data_lake/templates/data-orchestrator/config.yml.j2
+++ b/ansible/roles/data_lake/templates/data-orchestrator/config.yml.j2
@@ -16,4 +16,8 @@ consumer:
   brokerURL: "{{ datalake_data_orch_broker_url }}"
   consumerGroup: "{{ datalake_data_orch_broker_consumer_group }}"
   topic: "{{ datalake_data_orch_broker_topic }}"
-  maxPollRecordsConfig: 10
\ No newline at end of file
+  maxPollRecordsConfig: 10
+tenantConfigs:
+  tenantId: "{{ datalake_synch_tenant_id }}"
+  userGroup: "{{ datalake_data_orch_user_group }}"
+  adminGroup: "{{ datalake_data_orch_admin_group }}"
\ No newline at end of file
diff --git a/data-orchestrator/data-orchestrator-service/data-orchestrator-api-server/src/main/dist/conf/config.yml b/data-orchestrator/data-orchestrator-service/data-orchestrator-api-server/src/main/dist/conf/config.yml
index 258b51e..8887fb4 100644
--- a/data-orchestrator/data-orchestrator-service/data-orchestrator-api-server/src/main/dist/conf/config.yml
+++ b/data-orchestrator/data-orchestrator-service/data-orchestrator-api-server/src/main/dist/conf/config.yml
@@ -5,13 +5,19 @@ messageFilter:
   eventType: "CREATE,MODIFY "
   resourceNameExclusions: "swp$"
 outboundEventProcessor:
-  pollingDelay: 10000
-  pollingInterval: 10000
-  numOfEventsPerPoll: 10
+  pollingInterval: 5
   workflowEngineHost: "localhost"
   workflowPort: 6565
+  drmsHost: "localhost"
+  drmsPort: 7070
+  mftHost: "localhost"
+  mftPort: "7004"
 consumer:
   brokerURL: "localhost:9092"
   consumerGroup: "DataOrchestratorGroup"
-  topic: "quickstart-events"
-  maxPollRecordsConfig: 10
\ No newline at end of file
+  topic: "data-orchestrator-file-events"
+  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