From 5fe1a114eab55453525c8127854271637755c6fb Mon Sep 17 00:00:00 2001
From: Felipe Montoya <felipe.montoya@edunext.co>
Date: Tue, 23 Feb 2016 16:50:28 -0500
Subject: [PATCH] Enable the changes to the ELASTIC_SEARCH_CONFIG setting to be
 read from cms.env.json or yaml as it is for the lms.

---
 cms/envs/aws.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/cms/envs/aws.py b/cms/envs/aws.py
index 0139c70062..80ab5a4e56 100644
--- a/cms/envs/aws.py
+++ b/cms/envs/aws.py
@@ -357,6 +357,8 @@ if FEATURES['ENABLE_COURSEWARE_INDEX'] or FEATURES['ENABLE_LIBRARY_INDEX']:
     # Use ElasticSearch for the search engine
     SEARCH_ENGINE = "search.elastic.ElasticSearchEngine"
 
+ELASTIC_SEARCH_CONFIG = ENV_TOKENS.get('ELASTIC_SEARCH_CONFIG', [{}])
+
 XBLOCK_SETTINGS = ENV_TOKENS.get('XBLOCK_SETTINGS', {})
 XBLOCK_SETTINGS.setdefault("VideoDescriptor", {})["licensing_enabled"] = FEATURES.get("LICENSING", False)
 XBLOCK_SETTINGS.setdefault("VideoModule", {})['YOUTUBE_API_KEY'] = AUTH_TOKENS.get('YOUTUBE_API_KEY', YOUTUBE_API_KEY)