Merge pull request #2954 from edx/clintonb/discovery-elasticsearch

Updated Elasticsearch settings for discovery service

playbooks/roles/discovery/defaults/main.yml

@@ -37,12 +37,11 @@ DISCOVERY_DATABASES:
     ATOMIC_REQUESTS: true
     CONN_MAX_AGE: 60
 
-DISCOVERY_ELASTICSEARCH_HOST: 'localhost'
-DISCOVERY_ES_INDEX: 'discovery'
-
-DISCOVERY_ELASTICSEARCH:
-  host: '{{ DISCOVERY_ELASTICSEARCH_HOST }}'
-  index: '{{ DISCOVERY_ES_INDEX }}'
+# Using SSL? See https://www.elastic.co/guide/en/shield/current/ssl-tls.html.
+# Using AWS? Use the AWS-provided host (e.g. https://search-test-abc123.us-east-1.es.amazonaws.com/).
+# Assuming the port corresponds that of the protocol (e.g. http=80, https=443), there is no need to specify a port.
+DISCOVERY_ELASTICSEARCH_URL: 'http://127.0.0.1:9200/'
+DISCOVERY_ELASTICSEARCH_INDEX_NAME: 'discovery'
 
 DISCOVERY_MEMCACHE: [ 'memcache' ]
 
@@ -94,9 +93,11 @@ DISCOVERY_SERVICE_CONFIG:
   DATABASE_OPTIONS:
     connect_timeout: 10
   DATABASES: '{{ DISCOVERY_DATABASES }}'
-  ELASTICSEARCH: '{{ DISCOVERY_ELASTICSEARCH }}'
   CACHES: '{{ DISCOVERY_CACHES }}'
 
+  ELASTICSEARCH_URL: '{{ DISCOVERY_ELASTICSEARCH_URL }}'
+  ELASTICSEARCH_INDEX_NAME: '{{ DISCOVERY_ELASTICSEARCH_INDEX_NAME }}'
+
   PLATFORM_NAME: '{{ DISCOVERY_PLATFORM_NAME }}'
 
   ECOMMERCE_API_URL: '{{ DISCOVERY_ECOMMERCE_API_URL }}'