From 74f75f8da30b57fb9df7214b9aa559e8ca7b6fd0 Mon Sep 17 00:00:00 2001
From: SMY ALTAMASH <30286162+SMYALTAMASH@users.noreply.github.com>
Date: Mon, 8 Jul 2019 11:04:27 +0530
Subject: [PATCH] User-org Service, ENC Service Updations (#596)
* User Org Service env vars
* jinja2 templating changes
* Env vars changes
* Missing } branck in vars
* Variable name change
---
ansible/inventory/env/group_vars/all.yml | 5 ++---
.../templates/sunbird_user-org-service.env | 20 ++++++++++++++++---
2 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/ansible/inventory/env/group_vars/all.yml b/ansible/inventory/env/group_vars/all.yml
index b534d2299..b4d5d7c96 100644
--- a/ansible/inventory/env/group_vars/all.yml
+++ b/ansible/inventory/env/group_vars/all.yml
@@ -589,10 +589,7 @@ es_api_host: "{{inventory_hostname}}"
sunbird_linked_content_base_url: "{{proto}}://{{proxy_server_name}}/play/content/"
enc_postgres_password: "{{core_vault_postgres_password}}"
user_org_service_postgres_password: "{{core_vault_postgres_password}}"
-# Depricated value ??
postgres_replication_user_password: "{{core_vault_postgres_password}}"
-# Content service is calling ekstep ??
-# Config service variables, not required
sunbird_config_service_url:
config_refresh_interval: 10
config_service_enabled: false
@@ -607,6 +604,8 @@ app_es_snapshot_host: "{{ groups['es'][0] }}"
app_snapshot_base_path: applicationelasticsearch
sunbird_es_host: "{{ groups['es'][0] }}"
+user_org_sunbird_es_host: "{{ sunbird_es_host }}"
+user_org_sunbird_es_port: "{{ sunbird_es_port }}"
#log es backup
log_es_snapshot_host: "{{ groups['log-es'][0] }}"
diff --git a/ansible/roles/stack-sunbird/templates/sunbird_user-org-service.env b/ansible/roles/stack-sunbird/templates/sunbird_user-org-service.env
index dc01bec09..88f5cf00a 100644
--- a/ansible/roles/stack-sunbird/templates/sunbird_user-org-service.env
+++ b/ansible/roles/stack-sunbird/templates/sunbird_user-org-service.env
@@ -1,3 +1,17 @@
-pg_user:
-pg_host:
-pg_password:
+sunbird_es_host={{user_org_sunbird_es_host}}
+sunbird_es_post={{user_org_sunbird_es_port}}
+database_connectionInfo_0_shardId={{user_org_database_connectionInfo_0_shardId}}
+database_connectionInfo_0_shardLabel={{user_org_database_connectionInfo_0_shardLabel}}
+database_connectionInfo_0_username={{user_org_database_connectionInfo_0_username}}
+database_connectionInfo_0_password={{user_org_database_connectionInfo_0_password}}
+database_connectionInfo_0_uri={{user_org_database_connectionInfo_0_uri}}
+database_connectionInfo_1_shardId={{user_org_database_connectionInfo_1_shardId}}
+database_connectionInfo_1_shardLabel={{user_org_database_connectionInfo_1_shardLabel}}
+database_connectionInfo_1_username={{user_org_database_connectionInfo_1_username}}
+database_connectionInfo_1_password={{user_org_database_connectionInfo_1_password}}
+database_connectionInfo_1_uri={{user_org_database_connectionInfo_1_uri}}
+database_connectionInfo_2_shardId_={{user_org_database_connectionInfo_2_shardId}}
+database_connectionInfo_2_shardLabel={{user_org_database_connectionInfo_2_shardLabel}}
+database_connectionInfo_2_username={{user_org_database_connectionInfo_2_username}}
+database_connectionInfo_2_password={{user_org_database_connectionInfo_2_password}}
+database_connectionInfo_2_uri={{user_org_database_connectionInfo_2_uri}}
--
GitLab