Merge pull request #4599 from edx/pwnage101/notes-docker-image-use-devstack-settings

Make the notes docker image use devstack settings by default

docker/build/edxapp/ansible_overrides.yml

@@ -37,3 +37,6 @@ edxapp_environment_extra:
   SELENIUM_PORT: '4444'
 
 EDXAPP_XQUEUE_URL: 'http://edx.devstack.xqueue:18040'
+
+EDXAPP_ENABLE_EDXNOTES: true
+EDXAPP_EDXNOTES_INTERNAL_API: 'http://edx.devstack.edx_notes_api:18120/api/v1'

docker/build/notes/ansible_overrides.yml

@@ -4,3 +4,8 @@ EDX_NOTES_API_MYSQL_HOST: 'db'
 EDX_NOTES_API_ELASTICSEARCH_URL: 'http://es:9200/'
 COMMON_MYSQL_MIGRATE_USER: '{{ EDX_NOTES_API_MYSQL_DB_USER }}'
 COMMON_MYSQL_MIGRATE_PASS: '{{ EDX_NOTES_API_MYSQL_DB_PASSWORD }}'
+
+# For the docker image, force it to use the devstack settings instead of the
+# default production settings (notesserver.settings.yaml_config).
+# This is also consistent with all other IDAs.
+EDX_NOTES_API_DJANGO_SETTINGS_MODULE: 'notesserver.settings.devstack'