Merge pull request #2111 from edx/e0d/separate-cache

Better for backward compatibility

playbooks/roles/edxapp/defaults/main.yml

@@ -84,7 +84,7 @@ EDXAPP_EMAIL_HOST_PASSWORD: ''
 EDXAPP_LOG_LEVEL: 'INFO'
 
 EDXAPP_MEMCACHE: [ 'localhost:11211' ]
-EDXAPP_CACHE_COURSE_STRUCTURE_MEMCACHE: [ 'localhost:11211' ]
+EDXAPP_CACHE_COURSE_STRUCTURE_MEMCACHE: "{{ EDXAPP_MEMCACHE }}"
 EDXAPP_COMMENTS_SERVICE_URL:  'http://localhost:18080'
 EDXAPP_COMMENTS_SERVICE_KEY:  'password'
 
@@ -747,6 +747,8 @@ generic_env_config:  &edxapp_generic_env
       <<: *default_generic_cache
       KEY_PREFIX: 'course_structure'
       LOCATION: "{{ EDXAPP_CACHE_COURSE_STRUCTURE_MEMCACHE }}"
+      # Default to two hours
+      TIMEOUT: "7200"
   CELERY_BROKER_TRANSPORT: 'amqp'
   CELERY_BROKER_HOSTNAME: "{{ EDXAPP_RABBIT_HOSTNAME }}"
   COMMENTS_SERVICE_URL: "{{ EDXAPP_COMMENTS_SERVICE_URL }}"