[airavata-data-lake] branch master updated: change iu_subnets to sharing_subnets

[is...@apache.org]

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

isjarana 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 7486042  change iu_subnets to sharing_subnets
     new 1c9c7eb  Merge pull request #88 from isururanawaka/master
7486042 is described below

commit 74860427aa1c496094390e11b059771061967eb8
Author: Isuru Ranawaka <ir...@gmail.com>
AuthorDate: Tue May 10 14:32:38 2022 -0400

    change iu_subnets to sharing_subnets
---
 .../inventories/prod-deployment/group_vars/all/vars.yml  |  3 ++-
 ansible/inventories/test/group_vars/all/vars.yml         | 16 +++++++++++++++-
 ansible/roles/data_lake/tasks/main.yml                   | 11 +++++++++++
 3 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/ansible/inventories/prod-deployment/group_vars/all/vars.yml b/ansible/inventories/prod-deployment/group_vars/all/vars.yml
index c15fc8d..8b1ab4b 100644
--- a/ansible/inventories/prod-deployment/group_vars/all/vars.yml
+++ b/ansible/inventories/prod-deployment/group_vars/all/vars.yml
@@ -104,6 +104,7 @@ datalake_data_orch_datasource_password: "{{ vault_datalake_data_orch_datasource_
 datalake_data_orch_host: localhost
 datalake_data_orch_http_port: 8899
 datalake_data_orch_grpc_port: 6566
+datalake_data_drms_rest_port: 10000
 datalake_data_orch_broker_url: "{{ kafka_url }}"
 datalake_data_orch_broker_consumer_group: DataOrchestratorGroup2
 datalake_data_orch_broker_topic: data-orchestrator-file-events
@@ -135,7 +136,7 @@ workflow_manager_custos_id: "{{ vault_workflow_manager_custos_id }}"
 workflow_manager_custos_secret: "{{ vault_workflow_manager_custos_secret }}"
 workflow_manager_work_dir: /home/airavata/tmp_data
 
-iu_subnets:
+sharing_subnets:
   - "149.163.0.0/16"
   - "140.182.0.0/16"
   - "149.165.0.0/16"
diff --git a/ansible/inventories/test/group_vars/all/vars.yml b/ansible/inventories/test/group_vars/all/vars.yml
index 16aa861..a79a0c3 100644
--- a/ansible/inventories/test/group_vars/all/vars.yml
+++ b/ansible/inventories/test/group_vars/all/vars.yml
@@ -133,4 +133,18 @@ workflow_manager_mft_client_secret: "{{ vault_workflow_manager_mft_client_secret
 workflow_manager_custos_host: custos.scigap.org
 workflow_manager_custos_port: 31499
 workflow_manager_custos_id: "{{ vault_workflow_manager_custos_id }}"
-workflow_manager_custos_secret: "{{ vault_workflow_manager_custos_secret }}"
\ No newline at end of file
+workflow_manager_custos_secret: "{{ vault_workflow_manager_custos_secret }}"
+
+sharing_subnets:
+  - "149.163.0.0/16"
+  - "140.182.0.0/16"
+  - "149.165.0.0/16"
+  - "192.68.133.0/24"
+  - "192.12.206.0/24"
+  - "149.159.0.0/16"
+  - "156.56.0.0/16"
+  - "149.161.0.0/16"
+  - "149.160.0.0/16"
+  - "149.166.0.0/16"
+  - "134.68.0.0/16"
+  - "129.79.0.0/16"
\ No newline at end of file
diff --git a/ansible/roles/data_lake/tasks/main.yml b/ansible/roles/data_lake/tasks/main.yml
index 20ec641..378c3b1 100644
--- a/ansible/roles/data_lake/tasks/main.yml
+++ b/ansible/roles/data_lake/tasks/main.yml
@@ -68,6 +68,17 @@
   with_items:
     - "{{ sharing_subnets }}"
 
+- name: open firewall port {{ datalake_data_drms_rest_port }} for DRMS REST connections
+  firewalld:
+    zone: public
+    permanent: yes
+    state: enabled
+    immediate: yes
+    rich_rule: rule family=ipv4 source address="{{ item }}" port port="{{ datalake_data_drms_rest_port }}" protocol=tcp accept
+  become: yes
+  with_items:
+    - "{{ sharing_subnets }}"
+
 - name: Create Datalake deployment directory {{ datalake_deployment_dir }}
   become: yes
   file: path={{ datalake_deployment_dir }}