Merge pull request #3898 from edx/mroytman/fixup-notes-ES-config

remove ES variables refactoring

CHANGELOG.md

+- Role: edx_notes_api
+  - Removed EDX_NOTES_API_ELASTICSEARCH_HOST.
+  - Removed EDX_NOTES_API_ELASTICSEARCH_PORT.
+  - EDX_NOTES_API_ELASTICSEARCH_URL.
+
 - Role: edxapp
   - Added the EDXAPP_ACTIVATION_EMAIL_SUPPORT_LINK URL with default value `''`.
   - Added the EDXAPP_PASSWORD_RESET_SUPPORT_LINK URL with default value `''`.

playbooks/roles/edx_notes_api/defaults/main.yml

@@ -23,10 +23,7 @@ EDX_NOTES_API_MYSQL_HOST: localhost
 EDX_NOTES_API_MYSQL_PORT: "3306"
 EDX_NOTES_API_MYSQL_OPTIONS:
   connect_timeout: 10
-EDX_NOTES_API_ELASTICSEARCH_HOST: "localhost"
-EDX_NOTES_API_ELASTICSEARCH_PORT: "9200"
-EDX_NOTES_API_ELASTICSEARCH_PROTOCOL: "http"
-EDX_NOTES_API_ELASTICSEARCH_URL: "{{ EDX_NOTES_API_ELASTICSEARCH_PROTOCOL }}://{{ EDX_NOTES_API_ELASTICSEARCH_HOST }}:{{ EDX_NOTES_API_ELASTICSEARCH_PORT }}"
+EDX_NOTES_API_ELASTICSEARCH_URL: "localhost:9200"
 EDX_NOTES_API_NEWRELIC_APPNAME: "{{ COMMON_ENVIRONMENT }}-{{ COMMON_DEPLOYMENT }}-notes"
 # Change these values!!
 EDX_NOTES_API_SECRET_KEY: "CHANGEME"