diff --git a/ansible/inventory/env/group_vars/all.yml b/ansible/inventory/env/group_vars/all.yml
index 89360ff0cad303abe3cdad60396e945252679c17..72bb17a1aae50e9b58a7f89be8f66f61dd4a72bf 100644
--- a/ansible/inventory/env/group_vars/all.yml
+++ b/ansible/inventory/env/group_vars/all.yml
@@ -185,7 +185,6 @@ sunbird_sso_publickey: "{{core_vault_sunbird_sso_publickey}}"
sunbird_azure_storage_account: "{{azure_account_name}}"
sunbird_azure_storage_key: "{{core_vault_sunbird_azure_storage_key}}"
sunbird_fcm_account_key: "{{core_vault_sunbird_fcm_account_key}}"
-sunbird_env_logo_url: "{{proto}}://{{proxy_server_name}}/common/images/sunbird_logo.png"
sunbird_msg_91_auth: "{{core_vault_msg_91_auth_key}}"
sunbird_telemetry_pdata_id: "{{env}}.sunbird.learning.service"
sunbird_encryption_key: "{{ core_vault_sunbird_encryption_key }}"
diff --git a/ansible/roles/stack-sunbird/defaults/main.yml b/ansible/roles/stack-sunbird/defaults/main.yml
index 43cb794b51d82d803451e17076505b1234b64523..56eeea67d0dfa62d0aee8ad03c3038cc52cc398e 100644
--- a/ansible/roles/stack-sunbird/defaults/main.yml
+++ b/ansible/roles/stack-sunbird/defaults/main.yml
@@ -45,7 +45,6 @@ content_limit_memory: 256M
keycloak_auth_server_url: "{{proto}}://{{proxy_server_name}}/auth"
keycloak_realm: sunbird
sunbird_web_url: "{{proto}}://{{proxy_server_name}}"
-sunbird_env_logo_url: http://www.paramountias.com/media/images/current-affairs/diksha-portal.jpg
sunbird_cassandra_port: 9042
sunbird_portal_title_name: 'portal'
sunbird_keycloak_client_id: 'portal'
diff --git a/ansible/roles/stack-sunbird/templates/sunbird_learner-service.env b/ansible/roles/stack-sunbird/templates/sunbird_learner-service.env
index 830e76a0a985fa41d3e8730fc5a0c8baf74c0f42..643a51c8ae6fb505cea95e078a39262960f14ed9 100644
--- a/ansible/roles/stack-sunbird/templates/sunbird_learner-service.env
+++ b/ansible/roles/stack-sunbird/templates/sunbird_learner-service.env
@@ -65,7 +65,6 @@ sunbird_api_mgr_base_url=http://content-service:5000
sunbird_cs_base_url={{sunbird_cs_base_url}}
sunbird_cs_search_path=/v1/content/search
-sunbird_env_logo_url={{sunbird_env_logo_url}}
sunbird_user_bulk_upload_size={{sunbird_user_bulk_upload_size}}
sunbird_installation_display_name={{sunbird_installation_display_name}}
diff --git a/ansible/roles/sunbird-auth-deploy/tasks/bootstrap.yml b/ansible/roles/sunbird-auth-deploy/tasks/bootstrap.yml
index 9389b39bdbced0ff49b6158f21185fc1b8b30883..52e5aef4e8bb1ff12447391025f83c1a5013090d 100644
--- a/ansible/roles/sunbird-auth-deploy/tasks/bootstrap.yml
+++ b/ansible/roles/sunbird-auth-deploy/tasks/bootstrap.yml
@@ -62,9 +62,9 @@
- name: Copy user manager roles file to tmp location
copy: src="files/python-keycloak-0.12.0/roles.json" dest="/tmp/roles.json" mode="0644"
-- name: Pausing for 100 seconds sometime for keycloak to run completely
+- name: Pausing for 60 seconds sometime for keycloak to run completely
pause:
- seconds: 10
+ seconds: 60
- name: Copy the keycloak bootstrap script
copy: src={{ role_path }}/files/python-keycloak-0.12.0/keycloak dest=/tmp
diff --git a/private_repo/ansible/inventory/dev/Core/common.yml b/private_repo/ansible/inventory/dev/Core/common.yml
index c30e17dbd3d9a433f6c20d50433d1bd6d4a7b5ae..f00220af52735c98aea3b001ff7499a8c7547016 100644
--- a/private_repo/ansible/inventory/dev/Core/common.yml
+++ b/private_repo/ansible/inventory/dev/Core/common.yml
@@ -1,5 +1,5 @@
-##########################################
-# Starting Of Core VARS
+############## Release-1.14.0 ##################
+
env: #Name of the environment, e.g. dev, staging or production.
env_name: "{{ env }}"
domain_name: #Domain on which the portal will be accessed. e.g. staging.{implementation-name}.org
@@ -8,7 +8,7 @@ bootstrap_user:
bootstrap_key_path:
ssh_public_key_deployer: "" # SSH Public key for deployer user, with which ansible will execute tasks
-ekstep_s3_env: qa # dev or qa or prod of ekstep for plugins
+ekstep_s3_env: # dev or qa or prod of ekstep for plugins
learningservice_ip: # Load balancer IP for learning server
searchservice_ip: # search service Load balancer IP
analyticsapi_ip: # Analytics Service Load Balancer IP
@@ -31,6 +31,7 @@ mail_server_host:
mail_server_username: ""
alerts_mailing_list : "" # Comma separated mail list for Alerts; eg: user1@mail.com, user2@mail.com
sunbird_mail_server_from_email: # Email ID that should be as from address in mails
+sunbird_env_logo_url: # put public url for logo, this logo url will be used in email sending.
# Kibana oauth authorized domains; for accessing kibana dashboard
kibana_oauth_authenticated_email_domains:
@@ -40,7 +41,7 @@ kibana_oauth_authenticated_email_ids:
- email1
- email2
monitor_alerts_mail_from_email: # From Address for alert mails
-sunbird_msg_sender: # SMS from Address; atleast 6 char
+sunbird_msg_sender: # SMS from Address; exact 6 char
sunbird_android_app_url: "" # Playstore url of android app; default is subird.org
# NOT MANDATORY VARS
@@ -50,24 +51,6 @@ sunbird_installation_email: "admin@sunbird.org" # fallback email for badger badg
upstream_url: "{{azure_account_name}}.blob.core.windows.net/{{sunbird_content_azure_storage_container}}" # Proxy url to get /assets/public
-####################### Please Check me #############################
-## Not used
-project: "sunbird"
-
-
-################################################
-
-# Keycloak values can be merged to keycloak role, once PR is merged
-keycloak_build_src: "keycloak_build"
-keycloak_ver: "keycloak-3.2.0.Final"
-keycloak_sms_provider_build: "keycloak-email-phone-autthenticator-1.0-SNAPSHOT.jar"
-keycloak_sms_provider_templates_src: "templates.tar.gz"
-keycloak_sms_provider_templates_dest: "/opt/keycloak/themes/sunbird/login"
-keycloak_ekstep_sunbird_login_theme_file: "login.tar.gz"
-keycloak_ekstep_sunbird_login_theme_dest: "/opt/keycloak/themes/sunbird/login"
-keycloak_postgresql: "postgresql-9.4.1212.jar"
-sunbird_auth_version: 1.0v
-
############## Release-1.15.0 & 2.0.0 ##################
#sunbird_cassandra_replication_strategy: '{"class":"NetworkTopologyStrategy","datacenter1":2}' # If using cluster give this value and choose datacenter and replication factor as required '{"class":"NetworkTopologyStrategy","datacenter1":2}' if not using cluster, leave this variable commented
diff --git a/private_repo/ansible/inventory/dev/DataPipeline/common.yml b/private_repo/ansible/inventory/dev/DataPipeline/common.yml
index 6cfaa8bc5c637d0df94fb1a7c0f531ffae35ca3b..2c5471499ab29ee83f9007a323acbd112559ba3b 100644
--- a/private_repo/ansible/inventory/dev/DataPipeline/common.yml
+++ b/private_repo/ansible/inventory/dev/DataPipeline/common.yml
@@ -1,6 +1,5 @@
-############## Common ######################
+###### Release 1.14.0 and 2.0.0 #######
-# Common vars for env
env:
proto:
domain_name:
@@ -8,9 +7,6 @@ ssh_public_key_deployer:
bootstrap_user:
bootstrap_key_path:
-#################### DP ##########################
-
-# Is it same as `channel_data_exhaust_bucket`
secor_azure_container_name: ""
secor_alerts_slack_channel: ""
@@ -18,10 +14,9 @@ dp_azure_account_name: # azure storage account name
default_org_hash_id: "" # channel id of the organization
# Data products monitoring web hooks
-data_exhaust_webhook_url: "" ####Slack webhook
-data_exhaust_Channel: "" ### salck channel for data products alerts
+data_exhaust_webhook_url: "" ## Slack webhook
+data_exhaust_Channel: "" ## salck channel for data products alerts
data_exhaust_name:
-bucket: #### same as secor_azure_container_name
stream_base_url: ""
# Media content
@@ -40,3 +35,6 @@ ingestion_kafka_topics:
num_of_partitions: 4
replication_factor: 1
retention_time: 604800000
+ - name: telemetry.ingest
+ num_of_partitions: 4
+ replication_factor: 1
diff --git a/private_repo/ansible/inventory/dev/DataPipeline/hosts b/private_repo/ansible/inventory/dev/DataPipeline/hosts
index 5243a3e7aa25847bc0be171b516c5208aa08424c..c0faba071cea0989a13c6f8adad6b2ed286712f9 100644
--- a/private_repo/ansible/inventory/dev/DataPipeline/hosts
+++ b/private_repo/ansible/inventory/dev/DataPipeline/hosts
@@ -102,6 +102,9 @@ yarn-slave
[local]
localhost
+[broker]
+0.0.0.0 #### its required for data products deploy
+
[dp:children]
local
processing-cluster-kafka
diff --git a/private_repo/ansible/inventory/dev/KnowledgePlatform/common.yml b/private_repo/ansible/inventory/dev/KnowledgePlatform/common.yml
index a4f306758d201ff6926f0188c3c8f608c122a962..bb15711bdd2af806d75e78d533d41c64df1c18a0 100644
--- a/private_repo/ansible/inventory/dev/KnowledgePlatform/common.yml
+++ b/private_repo/ansible/inventory/dev/KnowledgePlatform/common.yml
@@ -1,9 +1,4 @@
-### !!! Remove this from public template !!!
-### !!! These are private values only for sunbird/ntp !!!
-instance_name: sunbird
-instance: dev
-
-############## Common ######################
+###### Release 1.14.0, 2.0.0 ########
env:
proto:
@@ -14,29 +9,17 @@ ekstep_domain_name:
ssh_public_key_deployer:
bootstrap_user:
bootstrap_key_path:
-###################### LP ############################
azure_public_container:
azure_account_name:
-
-
-# This variable should change value per env
-# eg:
-# environment_id: "10000000" # for dev
-# environment_id: "20000000" # for staging env
-
-environment_id:
-
-########### jenkinspipeline upload artifact ############
-artifacts_container:
-
-
+environment_id: # Should be a number of 8 digit like 1000000. This should be unique per environment
neo4j_zip: neo4j-enterprise-3.3.9-unix.tar.gz # neo4j enterprise version.zip present in the artifacts folder
neo4j_home: "{{learner_user_home}}/{{neo4j_dir}}/neo4j-enterprise-3.3.9" # Change this path to the version of neo4j you will be using
neo4j_enterprise: "true"
+########### Jenkinspipeline upload artifact ############
+artifacts_container:
+
## backup
-backup_azure_storage_account_name: sunbirdbackupsdev
-### overriding backup secret
+backup_azure_storage_account_name:
backup_azure_storage_access_key: "{{lp_vault_azure_storage_secret}}"
-