From b3891c176f709a69dc3d136543f5e4e7555cb771 Mon Sep 17 00:00:00 2001
From: Omar Al-Ithawi <i@omardo.com>
Date: Tue, 10 Dec 2019 22:35:51 +0300
Subject: [PATCH] Enable search by default in devstack

---
 cms/envs/devstack.py        | 4 ++--
 cms/envs/devstack_docker.py | 5 +++--
 lms/envs/devstack.py        | 6 +++---
 lms/envs/devstack_docker.py | 7 ++++---
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/cms/envs/devstack.py b/cms/envs/devstack.py
index 47aa91d9298b..72bca8fe614e 100644
--- a/cms/envs/devstack.py
+++ b/cms/envs/devstack.py
@@ -120,8 +120,8 @@ def should_show_debug_toolbar(request):
 XBLOCK_SETTINGS.update({'VideoDescriptor': {'licensing_enabled': True}})
 
 ################################ SEARCH INDEX ################################
-FEATURES['ENABLE_COURSEWARE_INDEX'] = True
-FEATURES['ENABLE_LIBRARY_INDEX'] = True
+FEATURES['ENABLE_COURSEWARE_INDEX'] = FEATURES.get('ENABLE_COURSEWARE_INDEX', True)
+FEATURES['ENABLE_LIBRARY_INDEX'] = FEATURES.get('ENABLE_LIBRARY_INDEX', True)
 SEARCH_ENGINE = "search.elastic.ElasticSearchEngine"
 
 ########################## Certificates Web/HTML View #######################
diff --git a/cms/envs/devstack_docker.py b/cms/envs/devstack_docker.py
index 9ce5038b7f2d..9d645db832bf 100644
--- a/cms/envs/devstack_docker.py
+++ b/cms/envs/devstack_docker.py
@@ -14,8 +14,9 @@
 LMS_ROOT_URL = 'http://{}'.format(LMS_BASE)
 
 FEATURES.update({
-    'ENABLE_COURSEWARE_INDEX': False,
-    'ENABLE_LIBRARY_INDEX': False,
+    # Appsembler: Hack to allow overriding those values from cms.env.json
+    # 'ENABLE_COURSEWARE_INDEX': True,
+    # 'ENABLE_LIBRARY_INDEX': True,
     'ENABLE_DISCUSSION_SERVICE': True,
 })
 
diff --git a/lms/envs/devstack.py b/lms/envs/devstack.py
index 7e674a5facd6..acbe7b735a3b 100644
--- a/lms/envs/devstack.py
+++ b/lms/envs/devstack.py
@@ -160,12 +160,12 @@ def should_show_debug_toolbar(request):
 
 
 ########################## Courseware Search #######################
-FEATURES['ENABLE_COURSEWARE_SEARCH'] = True
+FEATURES['ENABLE_COURSEWARE_SEARCH'] = FEATURES.get('ENABLE_COURSEWARE_SEARCH', True)
 SEARCH_ENGINE = "search.elastic.ElasticSearchEngine"
 
 
 ########################## Dashboard Search #######################
-FEATURES['ENABLE_DASHBOARD_SEARCH'] = True
+FEATURES['ENABLE_DASHBOARD_SEARCH'] = FEATURES.get('ENABLE_DASHBOARD_SEARCH', True)
 
 
 ########################## Certificates Web/HTML View #######################
@@ -188,7 +188,7 @@ def should_show_debug_toolbar(request):
     'language': LANGUAGE_MAP,
 }
 
-FEATURES['ENABLE_COURSE_DISCOVERY'] = True
+FEATURES['ENABLE_COURSE_DISCOVERY'] = FEATURES.get('ENABLE_COURSE_DISCOVERY', True)
 # Setting for overriding default filtering facets for Course discovery
 # COURSE_DISCOVERY_FILTERS = ["org", "language", "modes"]
 FEATURES['COURSES_ARE_BROWSEABLE'] = True
diff --git a/lms/envs/devstack_docker.py b/lms/envs/devstack_docker.py
index f4928ef2f854..bd805387fe63 100644
--- a/lms/envs/devstack_docker.py
+++ b/lms/envs/devstack_docker.py
@@ -43,9 +43,10 @@
 
 FEATURES.update({
     'AUTOMATIC_AUTH_FOR_TESTING': True,
-    'ENABLE_COURSEWARE_SEARCH': False,
-    'ENABLE_COURSE_DISCOVERY': False,
-    'ENABLE_DASHBOARD_SEARCH': False,
+    # Appsembler: Hack to allow overriding those values from lms.env.json
+    # 'ENABLE_COURSEWARE_SEARCH': True,
+    # 'ENABLE_COURSE_DISCOVERY': True,
+    # 'ENABLE_DASHBOARD_SEARCH': True,
     'ENABLE_DISCUSSION_SERVICE': True,
     'SHOW_HEADER_LANGUAGE_SELECTOR': True,
     'ENABLE_ENTERPRISE_INTEGRATION': False,