Merge pull request #106 from edx/clintonb/minor-fixes

Multiple small fixes

course_discovery/settings/base.py

@@ -298,14 +298,11 @@ SWAGGER_SETTINGS = {
     'permission_denied_handler': 'course_discovery.apps.api.views.api_docs_permission_denied_handler'
 }
 
-ELASTICSEARCH_URL = 'http://127.0.0.1:9200/'
-ELASTICSEARCH_INDEX_NAME = 'catalog'
-
 HAYSTACK_CONNECTIONS = {
     'default': {
         'ENGINE': 'course_discovery.apps.core.haystack_backends.SimplifiedElasticsearchSearchEngine',
-        'URL': ELASTICSEARCH_URL,
-        'INDEX_NAME': ELASTICSEARCH_INDEX_NAME,
+        'URL': 'http://localhost:9200/',
+        'INDEX_NAME': 'catalog',
     },
 }
 

course_discovery/settings/test.py

@@ -32,7 +32,7 @@ DATABASES = {
 HAYSTACK_CONNECTIONS = {
     'default': {
         'ENGINE': 'haystack.backends.elasticsearch_backend.ElasticsearchSearchEngine',
-        'URL': os.environ.get('TEST_ELASTICSEARCH_URL', 'http://127.0.0.1:9200/'),
+        'URL': os.environ.get('TEST_ELASTICSEARCH_URL', 'http://localhost:9200/'),
         'INDEX_NAME': 'catalog_test',
     },
 }

requirements/base.txt

@@ -9,7 +9,7 @@ django-waffle==0.11
 djangorestframework==3.3.3
 djangorestframework-jwt==1.7.2
 djangorestframework-xml==1.3.0
-django-rest-swagger[reST]==0.3.5
+django-rest-swagger[reST]==0.3.6
 dry-rest-permissions==0.1.6
 edx-auth-backends==0.2.3
 edx-ccx-keys==0.2.0