Merge pull request #1284 from edx/jarv/edxapp-defaults

Jarv/edxapp defaults

playbooks/roles/edxapp/defaults/main.yml

@@ -460,21 +460,21 @@ generic_env_config:  &edxapp_generic_env
     default: &default_generic_cache
       BACKEND:  'django.core.cache.backends.memcached.MemcachedCache'
       KEY_FUNCTION:  'util.memcache.safe_key'
-      KEY_PREFIX:  'sandbox_default'
+      KEY_PREFIX: 'default'
       LOCATION: $EDXAPP_MEMCACHE
     general:
       <<: *default_generic_cache
-      KEY_PREFIX:  'sandbox_general'
+      KEY_PREFIX:  'general'
     mongo_metadata_inheritance:
       <<: *default_generic_cache
-      KEY_PREFIX:  'integration_mongo_metadata_inheritance'
+      KEY_PREFIX:  'mongo_metadata_inheritance'
       TIMEOUT: 300
     staticfiles:
       <<: *default_generic_cache
-      KEY_PREFIX:  'integration_static_files'
+      KEY_PREFIX: "{{ ansible_hostname|default('staticfiles') }}_general"
     celery:
       <<: *default_generic_cache
-      KEY_PREFIX:  'integration_celery'
+      KEY_PREFIX:  'celery'
       TIMEOUT: "7200"
   CELERY_BROKER_TRANSPORT: 'amqp'
   CELERY_BROKER_HOSTNAME: $EDXAPP_RABBIT_HOSTNAME