Merge branch 'jarv/single-instance-fixes' of github.com:edx/configuration into…

Merge branch 'jarv/single-instance-fixes' of github.com:edx/configuration into jarv/single-instance-fixes

playbooks/roles/edxapp/vars/main.yml

@@ -15,10 +15,10 @@ edxapp_generic_auth_config:  &edxapp_generic_auth
   'AWS_SECRET_ACCESS_KEY':  ''
   'SECRET_KEY':  ''
   'XQUEUE_INTERFACE':
-    'basic_auth': [ 'noauth',  'noauth']
+    'basic_auth': [ 'edx',  'edx']
     'django_auth': { 'password':  'password',
       'username':  'lms'}
-    'url':  'https://localhost'
+    'url':  'https://localhost:18040'
   'CONTENTSTORE':
     'ENGINE':  'xmodule.contentstore.mongo.MongoContentStore'
     'OPTIONS':
@@ -55,8 +55,8 @@ edxapp_generic_auth_config:  &edxapp_generic_auth
       'PORT': '3306'
   'PEARSON_TEST_PASSWORD':  ''
   'OPEN_ENDED_GRADING_INTERFACE':
-    'url':  ''
-    'password':  ''
+    'url':  'http://localhost:18091'
+    'password':  'password'
     'peer_grading':  'peer_grading'
     'staff_grading':  'staff_grading'
     'grading_controller':  'grading_controller'