fixing example hash

playbooks/secure_example/vars/edxapp_ref_vars.yml

@@ -2,15 +2,11 @@
 #Use YAML references (& and *) and hash merge <<: to factor out shared settings
 #see http://atechie.net/2009/07/merging-hashes-in-yaml-conf-files/
 lms_auth_config:  &lms_auth
-  'CONTENTSTORE':
-    'ENGINE':  'xmodule.contentstore.mongo.MongoContentStore'
-  'MODULESTORE':
-    'default':
-      'ENGINE':  'xmodule.modulestore.mongo.MongoModuleStore'
   'ANALYTICS_API_KEY':  'hidden-prod'
   'AWS_ACCESS_KEY_ID':  'hidden-prod'
   'AWS_SECRET_ACCESS_KEY':  'hidden-prod'
   'CONTENTSTORE':
+    'ENGINE':  'xmodule.contentstore.mongo.MongoContentStore'
     'OPTIONS':
       'db':  'hidden-prod'
       'host': [ 'hidden-prod',  'hidden-prod']
@@ -24,6 +20,7 @@ lms_auth_config:  &lms_auth
       'USER':  'hidden-prod'}
   'MODULESTORE':
     'default':
+      'ENGINE':  'xmodule.modulestore.mongo.MongoModuleStore'
       'OPTIONS':  &lms_modulestore_default_options
         'collection':  'hidden-prod'
         'db':  'hidden-prod'
@@ -47,20 +44,6 @@ lms_auth_config:  &lms_auth
     'url':  'hidden-prod'
  
 lms_env_config:  &lms_env
-  'CACHES':
-    'default':
-      'BACKEND':  'django.core.cache.backends.memcached.MemcachedCache'
-      'KEY_FUNCTION':  'util.memcache.safe_key'
-    'general':
-      'BACKEND':  'django.core.cache.backends.memcached.MemcachedCache'
-      'KEY_FUNCTION':  'util.memcache.safe_key'
-    'mongo_metadata_inheritance':
-      'BACKEND':  'django.core.cache.backends.memcached.MemcachedCache'
-      'KEY_FUNCTION':  'util.memcache.safe_key'
-      'TIMEOUT': 300
-    'staticfiles':
-      'BACKEND':  'django.core.cache.backends.memcached.MemcachedCache'
-      'KEY_FUNCTION':  'util.memcache.safe_key'
   'CERT_QUEUE':  'certificates'
 #  'COURSE_LISTINGS':
 #    'default': ['MITx/6.002x/2012_Fall']
@@ -101,18 +84,27 @@ lms_env_config:  &lms_env
   'TIME_ZONE': 'America/New_York'
   'CACHES':  &lms_caches
     'default':
+      'BACKEND':  'django.core.cache.backends.memcached.MemcachedCache'
+      'KEY_FUNCTION':  'util.memcache.safe_key'
       'KEY_PREFIX':  'hidden-prod'
       'LOCATION': [ 'hidden-prod',
         'hidden-prod']
     'general':
+      'BACKEND':  'django.core.cache.backends.memcached.MemcachedCache'
+      'KEY_FUNCTION':  'util.memcache.safe_key'
       'KEY_PREFIX':  'hidden-prod'
       'LOCATION': [ 'hidden-prod',
         'hidden-prod']
     'mongo_metadata_inheritance':
+      'BACKEND':  'django.core.cache.backends.memcached.MemcachedCache'
+      'KEY_FUNCTION':  'util.memcache.safe_key'
+      'TIMEOUT': 300
       'KEY_PREFIX':  'hidden-prod'
       'LOCATION': [ 'hidden-prod',
         'hidden-prod']
     'staticfiles':
+      'BACKEND':  'django.core.cache.backends.memcached.MemcachedCache'
+      'KEY_FUNCTION':  'util.memcache.safe_key'
       'KEY_PREFIX':  'hidden-prod'
       'LOCATION': [ 'hidden-prod',
         'hidden-prod']