Merge pull request #1295 from edx/jarv/updates-for-edge

adding some vars needed in edge

playbooks/roles/edxapp/defaults/main.yml

@@ -69,6 +69,7 @@ EDXAPP_ZENDESK_URL: ""
 EDXAPP_ZENDESK_API_KEY: ""
 EDXAPP_CELERY_USER: 'celery'
 EDXAPP_CELERY_PASSWORD: 'celery'
+EDXAPP_CELERY_BROKER_VHOST: ""
 
 EDXAPP_VIDEO_CDN_URLS:
   EXAMPLE_COUNTRY_CODE: "http://example.com/edx/video?s3_url="
@@ -228,6 +229,7 @@ EDXAPP_MICROSITE_CONFIGURATION: {}
 # Instructor code that will not be run in the code sandbox
 EDXAPP_COURSES_WITH_UNSAFE_CODE: []
 EDXAPP_SESSION_COOKIE_DOMAIN: ""
+EDXAPP_SESSION_COOKIE_NAME: "sessionid"
 
 # XML Course related flags
 EDXAPP_XML_FROM_GIT: false
@@ -250,7 +252,8 @@ EDXAPP_CODE_JAIL_LIMITS:
   # Needs to be non-zero so that jailed code can use it as their temp directory.(1MiB in bytes)
   FSIZE: 1048576
 
-
+EDXAPP_VIRTUAL_UNIVERSITIES: []
+EDXAPP_SUBDOMAIN_BRANDING: {}
 #-------- Everything below this line is internal to the role ------------
 
 #Use YAML references (& and *) and hash merge <<: to factor out shared settings
@@ -423,6 +426,7 @@ edxapp_generic_auth_config:  &edxapp_generic_auth
   THIRD_PARTY_AUTH: $EDXAPP_THIRD_PARTY_AUTH
 
 generic_env_config:  &edxapp_generic_env
+  CELERY_BROKER_VHOST: $EDXAPP_CELERY_BROKER_VHOST
   PAYMENT_SUPPORT_EMAIL: $EDXAPP_PAYMENT_SUPPORT_EMAIL
   ZENDESK_URL: $EDXAPP_ZENDESK_URL
   COURSES_WITH_UNSAFE_CODE: $EDXAPP_COURSES_WITH_UNSAFE_CODE
@@ -481,6 +485,7 @@ generic_env_config:  &edxapp_generic_env
   COMMENTS_SERVICE_URL: $EDXAPP_COMMENTS_SERVICE_URL
   LOGGING_ENV: $EDXAPP_LOGGING_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
@@ -504,6 +509,8 @@ generic_env_config:  &edxapp_generic_env
   ORA2_FILE_PREFIX: $EDXAPP_ORA2_FILE_PREFIX
   FILE_UPLOAD_STORAGE_BUCKET_NAME: $EDXAPP_FILE_UPLOAD_STORAGE_BUCKET_NAME
   FILE_UPLOAD_STORAGE_PREFIX: $EDXAPP_FILE_UPLOAD_STORAGE_PREFIX
+  VIRTUAL_UNIVERSITIES: $EDXAPP_VIRTUAL_UNIVERSITIES
+  SUBDOMAIN_BRANDING: $EDXAPP_SUBDOMAIN_BRANDING
 
 
 lms_auth_config: