Release 4.0.0 (#2685)

* fix: add ignore errors if KC is already stopped (#2677)

* fix: remove default values for KC secrets (#2680)

* SB-24483 : Feat: Env variable change (#2663)

* SB-24483 : Feat: Env variable change

* SB-24483: Fix: variable name change

* release-4.0.0: feat: New variable update

* release-4.0.0: Fix: variable update

Co-authored-by: kiranTunerlabs <kiran@tunerlabs.com>

Co-authored-by: amorphous-1 <engg-access@ekstep.org>
Co-authored-by: Kiran Haridas <kiranharidas187@gmail.com>
Co-authored-by: kiranTunerlabs <kiran@tunerlabs.com>

ansible/roles/keycloak-deploy/handlers/main.yml

@@ -4,6 +4,7 @@
   command: /etc/init.d/keycloak stop
   poll: 5
   async: 5
+  ignore_errors: true
 
 - name: wait for keycloak to stop
   wait_for:

ansible/roles/stack-sunbird/templates/sunbird_player.env

@@ -156,3 +156,5 @@ sunbird_portal_session_secret={{sunbird_portal_session_secret}}
 
 #release-4.0.0
 sunbird_base_proto={{sunbird_base_proto | default(proto)}}
+ML_SERVICE_BASE_URL={{ml_survey_url|default(proto+'://' +domain_name) }}
+

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

@@ -22,6 +22,22 @@ core_vault_proxy_site_crt: |+
 
 core_vault_sunbird_api_auth_token: # Take the jwt token of api-admin consumer from Jenkins job console output after running OnboardConsumers - Use the same value in DP secrets.yml also for the variable sunbird_api_auth_token
 
+# Keycloak client secret uuids
+# You can generate unique ids using the below command
+# sudo apt install uuid-runtime
+# uuidgen
+sunbird_trampoline_android_keycloak_secret: ""               # Keycloak trampoline-android client secret
+sunbird_trampoline_desktop_keycloak_secret: ""               # Keycloak trampoline-desktop client secret
+core_vault_sunbird_google_keycloak_secret: ""                # Keycloak google-auth client secret
+core_vault_nodebb_secret: ""                                 # Keycloak nodebb client secret
+core_vault_android_keycloak_secret: ""                       # Keycloak android client secret
+core_vault_desktop_secret: ""                                # Keycloak desktop client secret
+sunbird_google_android_keycloak_secret: ""                   # Keycloak google auth android client secret
+sunbird_google_desktop_keycloak_secret: ""                   # Keycloak google auth desktop client secret
+core_vault_sunbird_sso_client_secret: ""                     # Keycloak lms client secret
+core_vault_sunbird_trampoline_secret: ""                     # Keycloak trampoline client secret
+core_vault_sunbird_keycloak_user_federation_provider_id: ""  # Keycloak cassandra federation id
+
 core_vault_sunbird_sso_publickey: # Public key of keycloak sunbird realm, update this post keycloak deployment.  See below for steps
 # SSH tunnel to the keycloak VM by running ssh -L 8080:localhost:8080 deployer@Keycloak-VM-IP
 # If you cannot tunnel directly to Keycloak VM, then tunnel to Jenkins first and then tunnel to Keycloak VM from jenkins
@@ -96,10 +112,10 @@ core_vault_kibana_google_client_secret:                  # You can use the same
 
 vault_core_url_shortner_access_token: ""                 # Url shortner access token if you want to shorten urls like forgot password link etc using an external service like bit.ly
 
-### IMPORTANT! IMPORTANT! IMPORTANT! ###
+### IMPORTANT! ###
 ### NOTE: FOR A REAL ENVIRONMENT YOU MUST CHANGE THE BELOW VALUES TO SOMETHING VERY SECRET WHICH ONLY YOU WILL KNOW! DO NOT USE THE DEFAULTS FOR REAL ENVIRONMENTS! ###
 # ------------------------------------------------------------------------------------------------------------ #
-# Sensible defaults which you need not change if you are just trying Sunbird- You should change these to something unique for real environments and not use the defaults
+# Sensible defaults which you need not change if you are just trying Sunbird - You should change these to something unique for real environments and not use the defaults
 
 core_vault_keycloak_api_management_user_password: admin
 core_vault_keystore_password: password                                                           # Password for encrypting data in cassandra
@@ -108,22 +124,10 @@ core_vault_sunbird_sso_password: admin
 core_vault_keycloak_password: admin                                                              # Keycloak admin password
 core_vault_grafana_admin_password: sunbird                                                       # Grafana admin password
 core_vault_truststore_password: sunbird                                                          # Password for cassandra trust store
-sunbird_trampoline_android_keycloak_secret: "4bc7294a-b6bc-11eb-8529-0242ac130003"               # Keycloak trampoline-android client secret
-sunbird_trampoline_desktop_keycloak_secret: "5eace0c2-b6bc-11eb-8529-0242ac130003"               # Keycloak trampoline-desktop client secret
-core_vault_sunbird_google_keycloak_secret: "640c645c-b6bc-11eb-8529-0242ac130003"                # Keycloak google-auth client secret
-core_vault_nodebb_secret: "67e03b08-b6bc-11eb-8529-0242ac130003"                                 # Keycloak nodebb client secret
-core_vault_android_keycloak_secret: "6bc1465e-b6bc-11eb-8529-0242ac130003"                       # Keycloak android client secret
-core_vault_desktop_secret: "6f5ec0d4-b6bc-11eb-8529-0242ac130003"                                # Keycloak desktop client secret
-sunbird_google_android_keycloak_secret: "7305abf8-b6bc-11eb-8529-0242ac130003"                   # Keycloak google auth android client secret
-sunbird_google_desktop_keycloak_secret: "76c8d328-b6bc-11eb-8529-0242ac130003"                   # Keycloak google auth desktop client secret
-core_vault_sunbird_sso_client_secret: "7a84906a-b6bc-11eb-8529-0242ac130003"                     # Keycloak lms client secret
-core_vault_sunbird_trampoline_secret: "7e150c64-b6bc-11eb-8529-0242ac130003"                     # Keycloak trampoline client secret
-core_vault_sunbird_keycloak_user_federation_provider_id: "8460f8f8-b6bc-11eb-8529-0242ac130003"  # Keycloak cassandra federation id
 core_vault_proxy_prometheus_admin_creds: admin                                                   # Prometheus admin password
 core_vault_postgres_username: postgres                                                           # Postgres user name
 core_vault_grafana_editor_password: sunbird                                                      # Grafana editor user password
 
-
 # ------------------------------------------------------------------------------------------------------------ #
 # Sensible defaults which you need not change - But if you would like to change, you are free to do so