Put back the $ vars that we need for now.

Among other things, booleans don't get passed around correctly.

playbooks/roles/edxapp/defaults/main.yml

@@ -118,12 +118,12 @@ EDXAPP_FEATURES:
   ENABLE_INSTRUCTOR_ANALYTICS: false
   SUBDOMAIN_BRANDING: false
   SUBDOMAIN_COURSE_LISTINGS: false
-  PREVIEW_LMS_BASE: "{{ EDXAPP_PREVIEW_LMS_BASE }}"
+  PREVIEW_LMS_BASE: $EDXAPP_PREVIEW_LMS_BASE
   ENABLE_S3_GRADE_DOWNLOADS: true
-  USE_CUSTOM_THEME: "{{ edxapp_use_custom_theme }}"
-  ENABLE_MKTG_SITE: "{{ EDXAPP_ENABLE_MKTG_SITE }}"
-  AUTOMATIC_AUTH_FOR_TESTING: "{{ EDXAPP_ENABLE_AUTO_AUTH }}"
-  ENABLE_THIRD_PARTY_AUTH: "{{ EDXAPP_ENABLE_THIRD_PARTY_AUTH }}"
+  USE_CUSTOM_THEME: $edxapp_use_custom_theme
+  ENABLE_MKTG_SITE: $EDXAPP_ENABLE_MKTG_SITE
+  AUTOMATIC_AUTH_FOR_TESTING: $EDXAPP_ENABLE_AUTO_AUTH
+  ENABLE_THIRD_PARTY_AUTH: $EDXAPP_ENABLE_THIRD_PARTY_AUTH
 
 EDXAPP_BOOK_URL: ""
 # This needs to be set to localhost
@@ -438,7 +438,7 @@ edxapp_generic_auth_config:  &edxapp_generic_auth
     db: "{{ EDXAPP_MONGO_DB_NAME }}"
     host: "{{ EDXAPP_MONGO_HOSTS }}"
     password: "{{ EDXAPP_MONGO_PASSWORD }}"
-    port: "{{ EDXAPP_MONGO_PORT }}"
+    port: $EDXAPP_MONGO_PORT
     user: "{{ EDXAPP_MONGO_USER }}"
     collection:  'modulestore'
   CONTENTSTORE:
@@ -451,7 +451,7 @@ edxapp_generic_auth_config:  &edxapp_generic_auth
       db: "{{ EDXAPP_MONGO_DB_NAME }}"
       host: "{{ EDXAPP_MONGO_HOSTS }}"
       password: "{{ EDXAPP_MONGO_PASSWORD }}"
-      port: "{{ EDXAPP_MONGO_PORT }}"
+      port: $EDXAPP_MONGO_PORT
       user: "{{ EDXAPP_MONGO_USER }}"
     ADDITIONAL_OPTIONS: "{{ EDXAPP_CONTENTSTORE_ADDITIONAL_OPTS }}"
     DOC_STORE_CONFIG: *edxapp_generic_default_docstore
@@ -534,7 +534,7 @@ generic_env_config:  &edxapp_generic_env
   COURSES_WITH_UNSAFE_CODE: "{{ EDXAPP_COURSES_WITH_UNSAFE_CODE }}"
   BULK_EMAIL_EMAILS_PER_TASK: "{{ EDXAPP_BULK_EMAIL_EMAILS_PER_TASK }}"
   MICROSITE_ROOT_DIR: "{{ EDXAPP_MICROSITE_ROOT_DIR }}"
-  MICROSITE_CONFIGURATION: "{{ EDXAPP_MICROSITE_CONFIGURATION }}"
+  MICROSITE_CONFIGURATION: $EDXAPP_MICROSITE_CONFIGURATION
   GRADES_DOWNLOAD:
     STORAGE_TYPE: "{{ EDXAPP_GRADE_STORAGE_TYPE }}"
     BUCKET: "{{ EDXAPP_GRADE_BUCKET }}"
@@ -591,8 +591,8 @@ generic_env_config:  &edxapp_generic_env
   SESSION_COOKIE_DOMAIN:  "{{ EDXAPP_SESSION_COOKIE_DOMAIN }}"
   SESSION_COOKIE_NAME:  "{{ EDXAPP_SESSION_COOKIE_NAME }}"
   COMMENTS_SERVICE_KEY: "{{ EDXAPP_COMMENTS_SERVICE_KEY }}"
-  SEGMENT_IO_LMS: "{{ EDXAPP_SEGMENT_IO_LMS }}"
-  SEGMENT_IO: "{{ EDXAPP_SEGMENT_IO }}"
+  SEGMENT_IO_LMS: $EDXAPP_SEGMENT_IO_LMS
+  SEGMENT_IO: $EDXAPP_SEGMENT_IO
   THEME_NAME: "{{ edxapp_theme_name }}"
   TECH_SUPPORT_EMAIL: "{{ EDXAPP_TECH_SUPPORT_EMAIL }}"
   CONTACT_EMAIL: "{{ EDXAPP_CONTACT_EMAIL }}"
@@ -634,7 +634,7 @@ lms_auth_config:
 
 lms_env_config:
   <<: *edxapp_generic_env
-  PAID_COURSE_REGISTRATION_CURRENCY: "{{ EDXAPP_PAID_COURSE_REGISTRATION_CURRENCY }}"
+  PAID_COURSE_REGISTRATION_CURRENCY: $EDXAPP_PAID_COURSE_REGISTRATION_CURRENCY
   SITE_NAME:  "{{ EDXAPP_LMS_SITE_NAME }}"
   VIDEO_CDN_URL: "{{ EDXAPP_VIDEO_CDN_URLS }}"
   CODE_JAIL: