Merge pull request #1 from project-sunbird/release-2.2.0

Release 2.2.0

private_repo/ansible/inventory/dev/Core/common.yml

 ##########################################
 # Starting Of Core VARS
 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
 proto:                          # Protocol
 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 of ekstep for plugins
+ekstep_s3_env: qa                       # 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
@@ -67,4 +68,6 @@ 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
 

private_repo/ansible/inventory/dev/Core/hosts

@@ -36,15 +36,26 @@ log-es-1
 [swarm-agent-for-prometheus:children]
 swarm-agent-for-prometheus-1
 
-[swarm-agent-for-grafana-1]
+[swarm-agent-for-prometheus-stateful:children]
+swarm-agent-for-prometheus
+
+[swarm-dashboard-1]
 18.0.0.15
 
-[swarm-agent-for-grafana:children]
-swarm-agent-for-grafana-1
+[swarm-dashboard:children]
+swarm-dashboard-1
 
-[swarm-agent-for-alertmanager-1]
+[swarm-agent-dashboard-1]
 18.0.0.15
 
+[swarm-agent-dashboard:children]
+swarm-agent-dashboard-1
+
+[alertmanager_stateful:children]
+swarm-agent-dashboard
+
+[swarm-agent-for-alertmanager-1]
+18.0.0.15
 
 [es-1]
 18.0.0.9 es_instance_name=es-1 es_etc_node_master=true es_etc_node_data=true
@@ -92,6 +103,15 @@ postgresql-master
 [kafka:children]
 kafka-1
 
+[processing-cluster-zookeepers]
+18.0.0.50              # Zookeeper IP of processing cluster in Data pipeline
+
+[zookeeper:children]
+processing-cluster-zookeepers
+
+[lp-redis]
+18.0.0.51              # Redis master IP of Knowledge platform
+
 [local]
 localhost
 
@@ -127,6 +147,8 @@ swarm-nodes
 swarm-manager
 kafka
 keycloak
+swarm-dashboard
+swarm-agent-dashboard
 
 [env:children]
 core
@@ -142,4 +164,4 @@ swarm-manager
 # cluster_name=DC1
 #
 ansible_ssh_user=deployer
-ansible_ssh_private_key_file=/run/secrets/deployer_ssh_key
+ansible_ssh_private_key_file=/var/lib/jenkins/secrets/deployer_ssh_key

private_repo/ansible/inventory/dev/Core/secrets.yml

 # !! Might deprecate 
 core_vault_sunbird_ekstep_api_key: 
-core_vault_sunbird_encryption_key: 
+core_vault_sunbird_encryption_key:       #Random hash to encrypt data
 core_vault_kong__test_jwt: 
 
 ############# Core #######################
@@ -21,7 +21,7 @@ core_vault_ansible_vault_password:
 ################### DONT FILL THESE VARIABLES INITIALLY ###################
 
 core_vault_sunbird_sso_publickey:  # Get After Keycloak Deployment
-core_vault_sunbird_api_auth_token: #Authorization key (JWT) to access Sunbird APIs. This will be in the output of deploy-apis.sh script, extracting it out is documented in the deployment wiki.
+core_vault_sunbird_api_auth_token: #Take the jwt token api-management-test-user from Jenkins job OnboardConsumers and update core_vault_sunbird_api_auth_token if using KP and DP along with core
 core_vault_sunbird_keycloak_user_federation_provider_id:      # Get after keycloak deployment
 
 ######################## Not mandatory ###################################

private_repo/ansible/inventory/dev/DataPipeline/hosts

@@ -9,6 +9,11 @@
 [core-cassandra]
 15.0.0.7
 
+[core-es-1]
+15.0.0.50    # This should be elasticsearch master IP of Core
+
+[core-es:children]
+core-es-1
 
 ################# LP ##########################
 [search]
@@ -56,9 +61,14 @@ cassandra
 15.0.3.8
 
 [influxdb]
-#15.0.3.8
 15.0.3.6
 
+[redis]
+15.0.3.5
+
+[redisall:children]
+redis
+
 [processing-cluster-kafka]
 15.0.3.8
 15.0.3.7
@@ -70,7 +80,6 @@ cassandra
 [telemetry-search-cluster1]
 15.0.2.6
 
-
 [telemetry-search-cluster:children]
 telemetry-search-cluster1
 

private_repo/ansible/inventory/dev/KnowledgePlatform/common.yml

@@ -38,5 +38,5 @@ neo4j_enterprise: "true"
 ## backup
 backup_azure_storage_account_name: sunbirdbackupsdev
 ### overriding backup secret
-backup_azure_storage_access_key: "{{lp_vault_backup_azure_storage_secret}}"
+backup_azure_storage_access_key: "{{lp_vault_azure_storage_secret}}"
 

private_repo/ansible/inventory/dev/KnowledgePlatform/hosts

@@ -31,9 +31,12 @@ redis1
 [learning-neo4j-cluster:children]
 learning-neo4j-node1
 
-[cassandra]
+[cassandra-node-1]   # The old cassandra group has been renamed to cassandra-node-* to accomadate for clusters
 15.0.2.7
 
+[cassandra:children]
+cassandra-node-1
+
 [dp-cassandra]
 15.0.2.7