diff --git a/ansible/inventory/env/group_vars/all.yml b/ansible/inventory/env/group_vars/all.yml index 1f7bc114303ec1589ebda9e1a862eca60d0d68cc..c0aeb2bcfa10bf02ea5596708d5b03baae9d4704 100644 --- a/ansible/inventory/env/group_vars/all.yml +++ b/ansible/inventory/env/group_vars/all.yml @@ -133,7 +133,7 @@ cassandra_restore_dir: "/home/{{ ansible_ssh_user }}/" cassandra_backup_azure_container_name: cassandra-backup cassandra_backup_dir: /data/cassandra/backup ### Release 5.0.0 ### -cassandra_isMutiDCEnabled: false +cassandra_multi_dc_enabled: false keycloak_realm: sunbird sunbird_content_player_url: "http://kong:8000/" @@ -365,7 +365,7 @@ content_service_whitelisted_mimetype: '' content_service_blacklisted_mimetype: '' sunbird_cloud_storage_urls: 'https://s3.ap-south-1.amazonaws.com/ekstep-public-{{ekstep_s3_env}}/,https://ekstep-public-{{ekstep_s3_env}}.s3-ap-south-1.amazonaws.com/,https://{{sunbird_public_storage_account_name}}.blob.core.windows.net/{{sunbird_content_azure_storage_container}}/' sunbird_email_max_recipients_limit: 100 -sunbird_cassandra_consistency_level: one +sunbird_cassandra_consistency_level: local_quorum sunbird_cassandra_replication_strategy: '{"class":"SimpleStrategy","replication_factor":"1"}' sunbird_lock_expiry_time: 3600 app_es_heap_size: 1500m @@ -468,6 +468,10 @@ job_names: api_report_mailing_list: "" ## This mailing list to send the daily api count report. if adaptor want to use they have to override in common.yml kafka_assessment_topic: "{{env_name}}.telemetry.assess" +### Release-5.0.0 kafka topic variables for merge user course and notification job ### +kafka_topic_lms_user_account: "{{env_name}}.lms.user.account.merge" +kafka_topic_lms_notification: "{{env_name}}.lms.notification" + # Portal vars for reports #sunbird_portal_azure_storage_account: "{{sunbird_azure_storage_account}}" #sunbird_portal_azure_storage_key: "{{sunbird_azure_storage_key}}" diff --git a/ansible/roles/stack-sunbird/templates/sunbird_cert-registry-service.env b/ansible/roles/stack-sunbird/templates/sunbird_cert-registry-service.env index dcde35ae4390e75687ec5d7198cc6a4711e29892..2ea34bac0bad15ae222b19dac8b6284506d984d6 100644 --- a/ansible/roles/stack-sunbird/templates/sunbird_cert-registry-service.env +++ b/ansible/roles/stack-sunbird/templates/sunbird_cert-registry-service.env @@ -6,7 +6,7 @@ sunbird_es_port={{sunbird_es_port}} sunbird_cassandra_keyspace={{sunbird_cassandra_keyspace|d('sunbird')}} sunbird_cassandra_username={{sunbird_cassandra_username|d('cassandra')}} sunbird_cassandra_password={{sunbird_cassandra_password|d('password')}} -sunbird_cassandra_consistency_level=quorum +sunbird_cassandra_consistency_level={{sunbird_cassandra_consistency_level}} {% if (cassandra_cluster_size | int) > 1 %} sunbird_cassandra_host={{groups['cassandra']|join(',')}} sunbird_cassandra_port=9042 @@ -14,3 +14,5 @@ sunbird_cassandra_port=9042 sunbird_cassandra_host={{sunbird_cassandra_host}} sunbird_cassandra_port=9042 {% endif %} +# Release-5.0.0 +isMultiDCEnabled={{cassandra_multi_dc_enabled}} diff --git a/ansible/roles/stack-sunbird/templates/sunbird_cert-service.env b/ansible/roles/stack-sunbird/templates/sunbird_cert-service.env index 686df40e63afb88ad6c8b83fcb1864f50e794f88..c43c23171b687e74597513c2be139798f8fdd485 100644 --- a/ansible/roles/stack-sunbird/templates/sunbird_cert-service.env +++ b/ansible/roles/stack-sunbird/templates/sunbird_cert-service.env @@ -1,13 +1,13 @@ CONTAINER_NAME={{cert_service_container_name}} -CLOUD_STORAGE_TYPE={{cert_service_cloud_storage_type}} -AZURE_STORAGE_SECRET={{sunbird_private_storage_account_key}} -AZURE_STORAGE_KEY={{sunbird_private_storage_account_name}} +CLOUD_STORAGE_TYPE={{cloud_service_provider}} +PRIVATE_CLOUD_STORAGE_SECRET={{sunbird_private_storage_account_key}} +PRIVATE_CLOUD_STORAGE_KEY={{sunbird_private_storage_account_name}} sunbird_cert_domain_url={{proto}}://{{proxy_server_name}} sunbird_cert_enc_service_url=http://enc-service:8013 download_link_expiry_timeout=600 es_conn_info={{groups['es']|join(':9200,')}}:9200 ITEXT_LICENSE_ENABLED={{itext_license_enabled}} ITEXT_LICENSE_PATH=/home/sunbird/itext_trail_license.xml -PUBLIC_AZURE_STORAGE_KEY={{sunbird_public_storage_account_name}} -PUBLIC_AZURE_STORAGE_SECRET={{sunbird_public_storage_account_key}} +PUBLIC_CLOUD_STORAGE_KEY={{sunbird_public_storage_account_name}} +PUBLIC_CLOUD_STORAGE_SECRET={{sunbird_public_storage_account_key}} PUBLIC_CONTAINER_NAME={{sunbird_cert_qr_container_name}} diff --git a/ansible/roles/stack-sunbird/templates/sunbird_groups-service.env b/ansible/roles/stack-sunbird/templates/sunbird_groups-service.env index 38e1c3cf8c6ce5d325d705452f8db600b04f67fe..2c1e2fe83d8de8791b7f76da4ed3102812a3881e 100644 --- a/ansible/roles/stack-sunbird/templates/sunbird_groups-service.env +++ b/ansible/roles/stack-sunbird/templates/sunbird_groups-service.env @@ -1,14 +1,13 @@ {% if (cassandra_cluster_size | int) > 1 %} sunbird_cassandra_host={{groups['cassandra']|join(',')}} sunbird_cassandra_port=9042,9042,9042 -sunbird_cassandra_consistency_level=quorum {% else %} sunbird_cassandra_host={{sunbird_cassandra_host}} sunbird_cassandra_port=9042 -sunbird_cassandra_consistency_level={{sunbird_cassandra_consistency_level}} {% endif %} sunbird_cassandra_password={{sunbird_cassandra_password|d('password')}} sunbird_cassandra_username={{sunbird_cassandra_username|d('cassandra')}} +sunbird_cassandra_consistency_level={{sunbird_cassandra_consistency_level}} LEARNER_SERVICE_PORT=http://learner-service:9000 sunbird_redis_host={{sunbird_redis_host}} sunbird_redis_port={{sunbird_redis_port|default(6379)}} @@ -41,3 +40,5 @@ notification_service_api_url=/v2/notification/send #“OFF“: To disable for all states #To allow multiple channel . please write as comma separated : e.g : tn,cg value enable_tenant_config={{enable_tenant_config| default('*')}} +# Release-5.0.0 +isMultiDCEnabled={{cassandra_multi_dc_enabled}} diff --git a/ansible/roles/stack-sunbird/templates/sunbird_learner-service.env b/ansible/roles/stack-sunbird/templates/sunbird_learner-service.env index 27b2569ba5509bd7b6060eb6badda48ea4d59d2d..79d0bfe1e356233caff1d742df09c4355bd92b01 100644 --- a/ansible/roles/stack-sunbird/templates/sunbird_learner-service.env +++ b/ansible/roles/stack-sunbird/templates/sunbird_learner-service.env @@ -39,13 +39,11 @@ sunbird_installation_email={{sunbird_installation_email}} {% if (cassandra_cluster_size | int) > 1 %} sunbird_cassandra_host={{groups['cassandra']|join(',')}} sunbird_cassandra_port=9042,9042,9042 -sunbird_cassandra_consistency_level=quorum {% else %} sunbird_cassandra_host={{sunbird_cassandra_host}} sunbird_cassandra_port=9042 -sunbird_cassandra_consistency_level={{sunbird_cassandra_consistency_level}} {% endif %} - +sunbird_cassandra_consistency_level={{sunbird_cassandra_consistency_level}} sunbird_mw_system_host=learner-service sunbird_mw_system_port=8088 background_actor_provider=local @@ -98,7 +96,8 @@ sunbird_cache_enable={{sunbird_cache_enable | default(false)}} sunbird_redis_host={{sunbird_redis_host}} sunbird_redis_port={{sunbird_redis_port|default(6379)}} kafka_urls={{kafka_urls}} -sunbird_user_cert_kafka_topic={{env_name}}.lms.user.account.merge +# Release-5.0.0 +sunbird_user_cert_kafka_topic={{kafka_topic_lms_user_account}} # Release-2.3.0 sunbird_reset_pass_msg={{sunbird_reset_pass_msg | d('You have requested to reset password. Click on the link to set a password: {0}')}} sunbird_fuzzy_search_threshold={{sunbird_fuzzy_search_threshold | d('0.5')}} @@ -129,3 +128,7 @@ user_index_alias={{user_index_alias | default('user_alias')}} org_index_alias={{org_index_alias | default('org_alias')}} sunbird_installation_display_name_for_sms=DIKSHA sunbird_sso_lb_ip={{keycloak_url}} + +# Release-5.0.0 +sunbird_cloud_service_provider={{cloud_service_provider}} +isMultiDCEnabled={{cassandra_multi_dc_enabled}} diff --git a/ansible/roles/stack-sunbird/templates/sunbird_lms-service.env b/ansible/roles/stack-sunbird/templates/sunbird_lms-service.env index 112c702f37d587fb270d63cb5fbf7c602ed3407a..6b790eb7352142eb2aba441ffb7ecf414fd8f1da 100644 --- a/ansible/roles/stack-sunbird/templates/sunbird_lms-service.env +++ b/ansible/roles/stack-sunbird/templates/sunbird_lms-service.env @@ -39,13 +39,11 @@ sunbird_installation_email={{sunbird_installation_email}} {% if (cassandra_cluster_size | int) > 1 %} sunbird_cassandra_host={{groups['cassandra']|join(',')}} sunbird_cassandra_port=9042,9042,9042 -sunbird_cassandra_consistency_level=quorum {% else %} sunbird_cassandra_host={{sunbird_cassandra_host}} sunbird_cassandra_port=9042 -sunbird_cassandra_consistency_level={{sunbird_cassandra_consistency_level}} {% endif %} - +sunbird_cassandra_consistency_level={{sunbird_cassandra_consistency_level}} sunbird_mw_system_host=lms-service sunbird_mw_system_port=8088 background_actor_provider=local @@ -142,4 +140,8 @@ druid_proxy_api_port=8082 druid_proxy_api_endpoint=/druid/v2/ collection_summary_agg_data_source={{ summary_agg_data_source | default('audit-rollup-syncts') }} collection_summary_agg_cache_ttl={{ summary_agg_ttl | default(21600) }} -enrollment_list_size={{ enrollment_list_size | default(1000) }} \ No newline at end of file +enrollment_list_size={{ enrollment_list_size | default(1000) }} + +# Release-5.0.0 +sunbird_cloud_service_provider={{cloud_service_provider}} +isMultiDCEnabled={{cassandra_multi_dc_enabled}} \ No newline at end of file diff --git a/ansible/roles/stack-sunbird/templates/sunbird_notification-service.env b/ansible/roles/stack-sunbird/templates/sunbird_notification-service.env index 6189bdafa506f4845ca44050ee17180aba7437d5..19b9d2607cbc35ac3445e9fd7db9fdc55011aeea 100644 --- a/ansible/roles/stack-sunbird/templates/sunbird_notification-service.env +++ b/ansible/roles/stack-sunbird/templates/sunbird_notification-service.env @@ -1,17 +1,17 @@ {% if (cassandra_cluster_size | int) > 1 %} sunbird_cassandra_host={{groups['cassandra']|join(',')}} sunbird_cassandra_port=9042,9042,9042 -sunbird_cassandra_consistency_level=quorum {% else %} sunbird_cassandra_host={{ groups['cassandra'][0] }} sunbird_cassandra_port=9042 -sunbird_cassandra_consistency_level=quorum {% endif %} +sunbird_cassandra_consistency_level={{sunbird_cassandra_consistency_level}} sunbird_cassandra_notification_keyspace=sunbird_notifications sunbird_cassandra_password={{sunbird_cassandra_password|d('password')}} sunbird_cassandra_username={{sunbird_cassandra_username|d('cassandra')}} sunbird_notification_kafka_servers_config={{sunbird_processing_kafka_host}} -sunbird_notification_kafka_topic={{env_name}}.lms.notification +# Release-5.0.0 +sunbird_notification_kafka_topic={{kafka_topic_lms_notification}} sunbird_notification_msg_default_sender={{sunbird_msg_sender}} sunbird_msg_91_auth={{sunbird_msg_91_auth}} sunbird_mail_server_from_email={{sunbird_mail_server_from_email}} @@ -35,3 +35,5 @@ LEARNER_SERVICE_PORT=http://learner-service:9000 sunbird_us_system_setting_url=/api/data/v1/system/settings/list sunbird_us_org_read_url=/v1/org/read notification_category_type_config=certificateUpdate +# Release-5.0.0 +isMultiDCEnabled={{cassandra_multi_dc_enabled}} diff --git a/kubernetes/helm_charts/sunbird-RC/registry/schemas/TrainingCertificate.json b/kubernetes/helm_charts/sunbird-RC/registry/schemas/TrainingCertificate.json index be84e538a37c99cbb20ca6dda6bd6023913fdf6a..2906929f2d186848ef7fd0e0ef2be85bd489ecb0 100644 --- a/kubernetes/helm_charts/sunbird-RC/registry/schemas/TrainingCertificate.json +++ b/kubernetes/helm_charts/sunbird-RC/registry/schemas/TrainingCertificate.json @@ -69,6 +69,6 @@ ], "systemFields": ["osCreatedAt", "osUpdatedAt", "osCreatedBy", "osUpdatedBy"], "enableLogin": false, - "credentialTemplate": "https://{{sunbird_public_storage_account_name}}.blob.core.windows.net/{{sunbird_content_azure_storage_container}}/schema/credential_template.json" + "credentialTemplate": "https://{{upstream_url}}/schema/credential_template.json" } } diff --git a/utils/sunbird-RC/schema/credential_template.json b/utils/sunbird-RC/schema/credential_template.json index 3f940546869a9bacaf771f40b5106ecfd7ecc5c9..8f467986cc4015948357a0f10b152601d9d7e406 100644 --- a/utils/sunbird-RC/schema/credential_template.json +++ b/utils/sunbird-RC/schema/credential_template.json @@ -1,7 +1,7 @@ { "@context": [ - "https://{{sunbird_public_storage_account_name}}.blob.core.windows.net/{{sunbird_content_azure_storage_container}}/schema/v1_context.json", - "https://{{sunbird_public_storage_account_name}}.blob.core.windows.net/{{sunbird_content_azure_storage_container}}/schema/sunbird_context.json" + "https://{{upstream_url}}/schema/v1_context.json", + "https://{{upstream_url}}/schema/sunbird_context.json" ], "type": [ "VerifiableCredential"