Merge pull request #577 from edx/will/fix-edxapp-defaults

Clean up edxapp defaults

playbooks/roles/edxapp/defaults/main.yml

@@ -45,8 +45,6 @@ EDXAPP_COMMENTS_SERVICE_KEY:  'password'
 
 EDXAPP_EDXAPP_SECRET_KEY: ''
 
-EDXAPP_PEARSON_TEST_PASWORD: ''
-
 EDXAPP_OEE_URL: 'http://localhost:18060/'
 EDXAPP_OEE_USER: 'lms'
 EDXAPP_OEE_PASSWORD: 'password'
@@ -64,7 +62,6 @@ EDXAPP_FEATURES:
   CERTIFICATES_ENABLED: true
   ENABLE_DISCUSSION_SERVICE: true
   ENABLE_INSTRUCTOR_ANALYTICS: true
-  ENABLE_PEARSON_HACK_TEST: false
   SUBDOMAIN_BRANDING: false
   SUBDOMAIN_COURSE_LISTINGS: false
   PREVIEW_LMS_BASE: $EDXAPP_PREVIEW_LMS_BASE
@@ -97,7 +94,7 @@ EDXAPP_CONTACT_EMAIL: 'info@example.com'
 EDXAPP_BUGS_EMAIL: 'bugs@example.com'
 EDXAPP_DEFAULT_FROM_EMAIL: 'registration@example.com'
 EDXAPP_DEFAULT_FEEDBACK_EMAIL: 'feedback@example.com'
-EDXAPP_SERVER_EMAIL: 'devops@example.com'
+EDXAPP_DEFAULT_SERVER_EMAIL: 'devops@example.com'
 EDXAPP_BULK_EMAIL_DEFAULT_FROM_EMAIL: 'no-reply@example.com'
 
 EDXAPP_ENV_EXTRA: {}
@@ -253,7 +250,6 @@ edxapp_generic_auth_config:  &edxapp_generic_auth
       PASSWORD: $EDXAPP_MYSQL_PASSWORD
       HOST: $EDXAPP_MYSQL_HOST
       PORT: $EDXAPP_MYSQL_PORT
-  PEARSON_TEST_PASSWORD:  $EDXAPP_PEARSON_TEST_PASSWORD
   OPEN_ENDED_GRADING_INTERFACE:
     url: $EDXAPP_OEE_URL
     password: $EDXAPP_OEE_PASSWORD