From d5454a808a6bfe2799aa718d53e3ff5ccf1ba15b Mon Sep 17 00:00:00 2001 From: Agrendalath Date: Thu, 30 Dec 2021 20:29:51 +0100 Subject: [PATCH 1/2] fix: replace `ELASTICSEARCH_URL` with `ELASTICSEARCH_CLUSTER_URL` for discovery The variable name has been changed in: https://github.com/edx/course-discovery/pull/2870/commits/df5e75fd217740bef6a77d0b9f86bcfb7ddc2a2e Co-authored-by: @0x29a --- CHANGELOG.md | 4 ++++ playbooks/roles/discovery/defaults/main.yml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 105b7bd35a5..e20c39ccfbd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ 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: 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. diff --git a/playbooks/roles/discovery/defaults/main.yml b/playbooks/roles/discovery/defaults/main.yml index 5002c787fc7..99f6b367909 100644 --- a/playbooks/roles/discovery/defaults/main.yml +++ b/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 }}' From 3677fd695c79a68d503cdbf6d4f88f70684ee55d Mon Sep 17 00:00:00 2001 From: Agrendalath Date: Thu, 30 Dec 2021 20:37:35 +0100 Subject: [PATCH 2/2] fix: replace `ELASTICSEARCH_URL` with `ELASTICSEARCH_DSL` for edx_notes_api The variable name has been changed in: https://github.com/edx/edx-notes-api/commit/e24a2678b5a268529b7bb6e610df75eac788cacc Co-authored-by: @0x29a --- CHANGELOG.md | 4 ++++ playbooks/roles/edx_notes_api/defaults/main.yml | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e20c39ccfbd..fbb9916353c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ 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`. diff --git a/playbooks/roles/edx_notes_api/defaults/main.yml b/playbooks/roles/edx_notes_api/defaults/main.yml index 0f8996a9f2a..a0c045c80fb 100644 --- a/playbooks/roles/edx_notes_api/defaults/main.yml +++ b/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