Issue #LR-122 merge: Release 7.0.0

ansible/inventory/env/group_vars/all.yml

@@ -10,7 +10,7 @@ api_proxy_name: "api.{{proxy_server_name}}"    # Domain name on which device reg
 swarm_load_balancer: "{{proxy_server_name}}"
 proxy_site_key: "{{ core_vault_proxy_site_key }}"  #SSL certificate's site.key file contents. More details in this wiki: {{proto}}://github.com/project-sunbird/sunbird-commons/wiki/Updating-SSL-certificates-in-Sunbird-Proxy-service
 proxy_site_crt: "{{ core_vault_proxy_site_crt }}"  #SSL certificate's site.crt file contents. More details in this wiki: {{proto}}://github.com/project-sunbird/sunbird-commons/wiki/Updating-SSL-certificates-in-Sunbird-Proxy-service
-sunbird_environment: "{{env}}" # +content-service learner
+sunbird_environment: "{{env}}" # +content-service userorg
 sunbird_installation: "{{env}}" # +keycloak
 sunbird_instance: "{{env}}"
 env_short_name: "{{env}}"
@@ -29,7 +29,7 @@ keycloak_management_user: "admin"
 keycloak_management_password: "{{core_vault_keycloak_password}}"
 tenant_name: sunbird
 
-## Learner service
+## UserOrg service
 sunbird_url_shortner_access_token: "{{vault_core_url_shortner_access_token}}"
 sunbird_url_shortner_enable: 'false'
 
@@ -38,7 +38,7 @@ sunbird_keycloak_required_action_link_expiration_seconds: 2592000
 sunbird_es_port: 9300
 mail_server_port: 587
 
-# Learner
+# UserOrg
 sunbird_user_profile_field_default_visibility: private
 
 # Player
@@ -176,7 +176,7 @@ sunbird_plugin_repo_api_base_url: "{{ sunbird_search_service_api_base_url }}"
 sunbird_data_service_api_base_url: "{{sunbird_ekstep_api_base_url}}"
 sunbird_data_service_api_key: "{{ core_vault_sunbird_api_auth_token }}"
 sunbird_content_service_api_base_url: "http://content-service.{{namespace}}.svc.cluster.local:9000"
-sunbird_user_service_api_base_url: "http://learner-service.{{namespace}}.svc.cluster.local:9000"
+sunbird_user_service_api_base_url: "http://userorg-service.{{namespace}}.svc.cluster.local:9000"
 sunbird_group_service_api_base_url: "http://groups-service:9000"
 plugin_media_base_url: "{{proto}}://{{domain_name}}"
 
@@ -237,7 +237,7 @@ enable_scraping_docker_metrics: false
 postgres_exporter_postgres_port: 5432
 postgres_exporter_user: postgres_exporter
 sunbird_cs_base_url: "http://{{sunbird_swarm_manager_lb_ip}}:5000"
-sunbird_user_service_base_url: "http://{{private_ingressgateway_ip}}/learner"
+sunbird_user_service_base_url: "http://{{private_ingressgateway_ip}}/userorg"
 kong_admin_api_url: http://localhost:8001
 
 
@@ -420,7 +420,7 @@ sunbird_sso_kafka_topic: "{{env_name}}.lms.sso.events"
 __yarn_host__: "{{ groups['yarn-master'][0] }}"
 zookeepers: "{{groups['zookeeper']|join(':2181,')}}:2181"
 kafka_brokers: "{{groups['processing-cluster-kafka']|join(':9092,')}}:9092"
-__lms_host__: "http://{{private_ingressgateway_ip}}/learner"
+__lms_host__: "http://{{private_ingressgateway_ip}}/userorg"
 sunbird_redis_host: "{{ groups['lp-redis'][0] }}"
 
 ### Release 2.1.0 ###
@@ -567,6 +567,8 @@ kp_schema_base_path: "{{ upstream_url }}/schemas/local"
 # SB-31155 - Moved to the installation public container for now (same place where keycloaka and java artifacts are stored)
 h5p_library_path: "https://sunbirdpublic.blob.core.windows.net/installation/h5p-standalone-1.3.4.zip"
 
-
 ## Added default values
-cloud_public_storage_proxy: "{{cloud_storage_url}}"
+cloud_public_storage_proxy: "{{cloud_storage_url}}"
+
+# Lern release-5.4.0
+sunbird_learner_service_local_base_url: "http://userorg-service:9000"

ansible/logstash-provision.yml

@@ -1,24 +1,24 @@
 - hosts: cassandra
   vars:
-   learner_group: learner
-   learner_name: learner
+   userorg_group: userorg
+   userorg_name: userorg
   vars_files:
     - "{{inventory_dir}}/secrets.yml"
   pre_tasks:
-    - name: Create learner group
+    - name: Create userorg group
       become: yes
       group:
         state: present
-        name: "{{ learner_group }}"
+        name: "{{ userorg_group }}"
         system: yes
-    - name: Create learner user
+    - name: Create userorg user
       become: yes
       user:
         state: present
-        name: "{{ learner_user }}"
-        comment: learner user
+        name: "{{ userorg_user }}"
+        comment: userorg user
         system: yes
         createhome: yes
-        group: "{{ learner_group }}"
+        group: "{{ userorg_group }}"
   roles:
     - logstash