Re-enable notes for general provisioning.

Update README to explain why some containers use ES7.
teltek · Oct 1, 2020 · 6c4c140 · 6c4c140
1 parent b49b8ec
commit 6c4c140
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/README.rst b/README.rst
@@ -1350,9 +1350,11 @@ GitHub issue which explains the `current status of implementing delegated consis
 Known Issues
 ------------
 
-The Notes service has been disabled and removed from provisioning due to issues with getting it working with ES7.
-It will be added again after these issues have been resolved, but Notes will have to be provisioned separately once
-the fixes have been merged.
+Currently, some containers rely on Elasticsearch 7 and some rely on Elasticsearch 1.5. This is
+because services are in the process of being upgraded to Elasticsearch 7, but not all of them
+support Elasticsearch 7 yet. As we complete these migrations, we will update the dependencies
+of these containers.
+
 
 
 Advanced Configuration Options

diff --git a/options.mk b/options.mk
@@ -67,9 +67,8 @@ FS_SYNC_STRATEGY ?= local-mounts
 # TODO: Re-evaluate this list and consider paring it down to a tighter core.
 #       The current value was chosen such that it would not change the existing
 #       Devstack behavior.
-# TODO: To resolve issues with notes provisioning with ES7, we are removing it from this list until it can be added again between ecommerce and forum.
 DEFAULT_SERVICES ?= \
-credentials+discovery+ecommerce+forum+frontend-app-publisher+frontend-app-learning+gradebook+lms+studio
+credentials+discovery+ecommerce+notes+forum+frontend-app-publisher+frontend-app-learning+gradebook+lms+studio
 
 # All edX services, whether or not they are run by default.
 # Separated by plus signs.