maple backport: add Elasticsearch variable overrides

CHANGELOG.md

@@ -4,6 +4,14 @@
 All notable changes to this project will be documented in this file.
 Add any new changes to the top (right below this line).
 
+ - 2022-01-06
+    - Role: edx_notes_api
+       - Replaced `ELASTICSEARCH_URL` with `ELASTICSEARCH_DSL` in `edx_notes_api_service_config`.
+
+ - 2022-01-06
+    - Role: discovery
+       - Replaced `ELASTICSEARCH_URL` with `ELASTICSEARCH_CLUSTER_URL` in `discovery_service_config_overrides`.
+
  - 2021-10-20
     - Role neo4j
        - Upgrade Neo4j from 3.3.1 to 3.5.28.

playbooks/roles/discovery/defaults/main.yml

@@ -151,7 +151,7 @@ DISCOVERY_REPOS:
 DISCOVERY_EXTRA_REQUIREMENTS: []
 
 discovery_service_config_overrides:
-  ELASTICSEARCH_URL: '{{ DISCOVERY_ELASTICSEARCH_URL }}'
+  ELASTICSEARCH_CLUSTER_URL: '{{ DISCOVERY_ELASTICSEARCH_URL }}'
   ELASTICSEARCH_INDEX_NAME: '{{ DISCOVERY_ELASTICSEARCH_INDEX_NAME }}'
 
   PLATFORM_NAME: '{{ DISCOVERY_PLATFORM_NAME }}'

playbooks/roles/edx_notes_api/defaults/main.yml

@@ -78,7 +78,9 @@ edx_notes_api_service_config:
   # replace with your oauth id and secret
   CLIENT_ID: "{{ EDX_NOTES_API_CLIENT_ID }}"
   CLIENT_SECRET: "{{ EDX_NOTES_API_CLIENT_SECRET }}"
-  ELASTICSEARCH_URL: "{{ EDX_NOTES_API_ELASTICSEARCH_URL }}"
+  ELASTICSEARCH_DSL:
+    default:
+      hosts: "{{ EDX_NOTES_API_ELASTICSEARCH_URL }}"
   ELASTICSEARCH_INDEX: "edx_notes"
   # Number of rows to return by default in result.
   RESULTS_DEFAULT_SIZE: 25